Files
git/git-mergetool.sh
Junio C Hamano 1998f4c096 Merge branch 'cb/maint-mergetool-no-tty'
* cb/maint-mergetool-no-tty:
  mergetool: Remove explicit references to /dev/tty

Conflicts:
	git-mergetool.sh
2010-09-03 09:43:44 -07:00

6.1 KiB
Executable File