RelNoteson commit mergetool: Add prompt to continue after failing to merge a file (b0169d8)
   1Documentation/RelNotes-1.6.1.txt