templates / this--descriptionon commit mergetool: Add prompt to continue after failing to merge a file (b0169d8)
   1Unnamed repository; edit this file to name it for gitweb.