mergetool: Add prompt to continue after failing to merge a file
[git/git-svn.git] / RelNotes
blob3d420845b117b3f3eb82d1f0948a61c7989d8af9
1 Documentation/RelNotes-1.6.1.txt