![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700) | ||
| commit | 1998f4c0966871d49ebf7f720dc58eb9f80771e9 | |
| tree | 50418170d8834e6e9f3479bc01517c234317050f | tree | snapshot |
| parent | 9502751181df4a1347b3bd0fe2f0f0cde9cfaa91 | commit | diff |
| parent | af3147147f39274bd0d47faca196f84c4e9ec68d | commit | diff |
Merge branch 'cb/maint-mergetool-no-tty'
* cb/maint-mergetool-no-tty:
mergetool: Remove explicit references to /dev/tty
Conflicts:
git-mergetool.sh
* cb/maint-mergetool-no-tty:
mergetool: Remove explicit references to /dev/tty
Conflicts:
git-mergetool.sh
| git-mergetool.sh | diff1 | | diff2 | | blob | history |