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):