SourceGear Support

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 '@'

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 ...

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 [diff] tool = diffmerge [merge] tool = diffmerge [mergetool "diffmerge"] trustExitCode = true cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \&quo...