Junio C Hamano b14989a23c Merge branch 'cb/maint-mergetool-no-tty' into next ...

* cb/maint-mergetool-no-tty:
  mergetool: Remove explicit references to /dev/tty

Conflicts:
	git-mergetool.sh

2010-08-26 16:43:33 -07:00

6.1 KiB

Executable File

Raw Blame History

View Raw