mergetool: Add prompt to continue after failing to merge a file
[git/git-svn.git] / gitk-git / 
tree82a35fb630e581eb4621dcd9b8bb10a70ea3fb7e
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 297536 gitk
drwxr-xr-x - po