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\"
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@