• Junio C Hamano's avatar
    Merge branch 'cb/mergetool' · 3827210b
    Junio C Hamano authored
    * cb/mergetool:
      mergetool: Don't keep temporary merge files unless told to
      mergetool: Add prompt to continue after failing to merge a file
      Add -y/--no-prompt option to mergetool
      Fix some tab/space inconsistencies in git-mergetool.sh
    3827210b
git-mergetool.sh 10.7 KB