How to Use ExamDiff Pro as Your Git Diff and Merge Tool

Steps

1. Tell Git to use ExamDiff Pro. In a command window, enter: git config --global diff.tool examdiff git config --global merge.tool examdiff Git (version 2.9 or later) knows ExamDiff Pro and finds it in its install folder. To skip Git's "Launch 'examdiff'?" question each time, also enter: git config --global difftool.prompt false git config --global mergetool.prompt false
2. To see your uncommitted changes, enter: git difftool Or name what to compare, for example git difftool main feature for two branches or git difftool HEAD~1 for the last commit. Each changed file opens in ExamDiff Pro side by side; exit ExamDiff Pro to go on to the next one. To see all changed files at once as a folder comparison, add --dir-diff.
3. When git merge (or git rebase, git cherry-pick, or git pull) stops with a merge conflict, enter: git mergetool
4. ExamDiff Pro opens each conflicted file in a three-way merge: your current branch on the left (LOCAL in the pane title), the version both branches started from in the center (BASE), and the branch you are merging in on the right (REMOTE). Changes made in only one branch are already merged into the bottom pane, and the first conflict is selected and marked red.
5. For each conflict, choose Merge | Use Left or Use Right (or Use Center, Use Left, Then Right, Use Right, Then Left), or type the text you want in the merge pane. Then choose Files | Save Merge Results and Files | Exit. Git moves on to the next conflicted file, if there is one.
6. Commit the merge as usual, for example with git commit.