Line Inspector panel for easy recognition of differences within lines.Ability to recognize moved text blocks.Highlights differences down to the level of lines, words or characters.Performs two-way and three-way diff and merge.Compares text files, binary files, and directories.If you’ve been frustrated with other comparison utilities, you will find that ExamDiff Pro offers a much more efficient and user-friendly way to compare files and folders. It features unique functionality that distinguishes ExamDiff Pro from other comparison programs. It is a good tool for both students and teachers to review the changes that have been made to a document. This works for me (SourceTree 1.6.22.0 with external git 2.6.1 64bit, ExamDiff Pro 6.0.3.12 64bit on Windows 8.ExamDiff is a slim, lightweight software tool to load and compare two different versions of the same document, or two related documents, to see where changes were made. Hint: You might need to adjust the path to ExamDiff.exe. Git config -global mergetool.keepBackup false Git config -global mergetool.prompt false Git config -global ''C:/Program Files/ExamDiff Pro/ExamDiff.exe' -merge '$REMOTE' '$BASE' '$LOCAL' -o:'$MERGED' -dn1:Theirs -dn2:Base -dn3:Yours -nh' Git config -global ''C:/Program Files/ExamDiff Pro/ExamDiff.exe' '$REMOTE' '$LOCAL' -nh' In your Git Bash window, enter the following commands: git config -global diff.tool edp

Yes, you can use -option instead of /option with ExamDiff which is quite usefull when using Unix style file paths.īTW: If you would like to use ExamDiff as git diff-/mergetool on the commandline too, here is my config to get this working: (the config given on the above page did not work!)

After adding 'Quotes' around the filenames and after reading the page I came up with:ĭiff Command: C:/Program Files/ExamDiff Pro/ExamDiff.exe (same as Thomas' version)Īrguments: -merge '$REMOTE' '$BASE' '$LOCAL' -o:'$MERGED' -dn1:Theirs -dn2:Base -dn3:Yours -nh

It didn't work for files in subdirectories. The answer given by Thomas did work only partially for me.

Examdiff pro download