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

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
yazoox
Posts: 3
Joined: Thu Aug 18, 2016 6:53 pm

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

Post by yazoox » Thu Aug 18, 2016 7:03 pm

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
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: git difftool can't work fine on directory diff with Diff

Post by Beth » Fri Aug 19, 2016 3:28 pm

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.
Beth Kieler
SourceGear Technical Support

yazoox
Posts: 3
Joined: Thu Aug 18, 2016 6:53 pm

Re: git difftool can't work fine on directory diff with Diff

Post by yazoox » Sun Aug 21, 2016 8:55 pm

Beth wrote: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
Screen Shot 2016-08-22 at 10.19.03 AM.png (38.39 KiB) Viewed 5598 times
Screen Shot 2016-08-22 at 10.21.27 AM.png
Screen Shot 2016-08-22 at 10.21.27 AM.png (42.31 KiB) Viewed 5598 times

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: git difftool can't work fine on directory diff with Diff

Post by Beth » Mon Aug 22, 2016 2:50 pm

What type of file is Berksfile?
Beth Kieler
SourceGear Technical Support

yazoox
Posts: 3
Joined: Thu Aug 18, 2016 6:53 pm

Re: git difftool can't work fine on directory diff with Diff

Post by yazoox » Mon Aug 22, 2016 10:49 pm

Beth wrote: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 '@'

Post Reply