git difftool can't work fine on directory diff with DiffMerg

[yazoox]

git difftool can't work fine on directory diff with DiffMerg

my os is mac 10.11 EI captian
my git config is as following

Code: Select all

[diff]
	tool = diffmerge
[merge]
	tool = diffmerge
[mergetool "diffmerge"]
	trustExitCode = true
	cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[difftool "diffmerge"]
	cmd = /usr/local/bin/diffmerge \"$LOCAL\" \"$REMOTE\"

I did some change to one file. then using `git difftool -y' can work fine.
But if I changed more than 2 files, and used 'git difftool -d -y'. the shown diffmerge dialog can't compare the folder because the left file is "file1.cpp", the right file name is "file1.cpp@"

Code: Select all

"LEFT"         "RIGHT"
Folder1        Folder1
file1.cpp 
               file1.cpp@

Folder2
file2.cpp     
               file2.cpp@

so, how to resolve this issue?

[Beth]

Let's rule out some things first.

Do you have the two folders you are comparing on your local hard drive? If so, launch DiffMerge independently of Git and compare the two folders. Does that work?

If the first test works, then do you get the same problem when you compare any two folders in Git? Try several others.

[yazoox]

Let's rule out some things first.

Do you have the two folders you are comparing on your local hard drive? If so, launch DiffMerge independently of Git and compare the two folders. Does that work?

If the first test works, then do you get the same problem when you compare any two folders in Git? Try several others.

Yes. If I use diffmerge to diff 2 folders, it can work fine. only fail when 'git difftool -d'.
Please check the attached screenshots. by using the 'git difftool -d', araxis can work but diffmerge can't.

Screen Shot 2016-08-22 at 10.19.03 AM.png (38.39 KiB) Viewed 13015 times

Screen Shot 2016-08-22 at 10.21.27 AM.png (42.31 KiB) Viewed 13015 times

[Beth]

What type of file is Berksfile?

[yazoox]

What type of file is Berksfile?

Just a text file without extension name.

I also tried to change a .cpp, .h file, and met the same issue. after calling git difftool -d, the file on the right side will be added '@'