Ediff like git difftool

Question

I am trying to use emacs ediff as git difftool.

I followed some of the configurations suggested here: Using ediff as a git mergetool

When it comes to comparing between different versions of git of a particular file, I have no problem at all: ediff works well and the differences between both versions display correctly.

However, I am having problems when I try to run git diffftool to compare the current version of the file directory with a specific version of git. For some files, I get the following error:

apply: Wrong type argument: arrayp, nil

This is strange because this error only occurs for certain files, and not for all.

I experimented with several files, and I think that the rule of thumb is as follows: - If the file to be compared does not fit in the git root directory, then it fails. - Otherwise, ediff shows the differences between the current version of the file and the specified version without any problems.

I tried with some of the configurations described in the link I mentioned above. They all give me the same result: git diffftool fails when comparing the current version of the file directory without root git with a specific version of git.

Any idea how this can be fixed?

Many thanks. -Bob

Answer 1

Git diff/merge, ediff/emerge.

git config --global diff.tool ediff

git difftool --tool=ediffclient master -- <file>

. ediffclient emacsclient, emacs, , YMMV.