t / t5100 / patch0007on commit mergetool: Add prompt to continue after failing to merge a file (b0169d8)
   1