1. If Notepad++ is installed, you can set it as default editor for Git:
    1. Open Command Prompt.

    2. Enter the following command (we are assuming a 32-bit installation of Notepad++ on 64-bit Windows here; use --global instead of --system to set it up for just the current user)

      git config --system core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -nosession -noPlugin"
  2. If ExamDiff Pro is installed, you can use it as a diff and merge tool (again, use --system instead of --global to set it up for all users):

    1. Open Command Prompt and enter the following commands:

      git config --system difftool.edp.cmd "'C:\Program Files\ExamDiff Pro\ExamDiff.exe' "$REMOTE" "$LOCAL" -nh -r2"
git config --system mergetool.edp.cmd "'C:\Program Files\ExamDiff Pro\ExamDiff.exe' -merge "$REMOTE" "$BASE" "$LOCAL" -o:"$MERGED" -dn1:Theirs -dn2:Base -dn3:Yours -dno:Output -nh"
git config --system diff.guitool edp
git config --system diff.tool edp
git config --system merge.tool edp
git config --system difftool.prompt false
git config --system difftool.keepbackup false
git config --system difftool.trustexitcode false
git config --system alias.examdiff "difftool --dir-diff --tool=edp"
    2. You can now use git mergetool to resolve merge conflicts and git examdiff (takes the same arguments as git diff) to compare versions.

  3. Ensure Git knows the file system is case-insensitive:

    1. Open Command Prompt and enter the following command:

      git config --system core.ignoreCase true