Junio C Hamano 3827210b91 Merge branch 'cb/mergetool' ...

* 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

2009-01-01 05:48:40 -08:00

11 KiB

Executable File

Raw Blame History

View Raw