diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:44 -0700 |
| commit | 1998f4c0966871d49ebf7f720dc58eb9f80771e9 (patch) | |
| tree | 50418170d8834e6e9f3479bc01517c234317050f /git-remote-testgit.py | |
| parent | 9502751181df4a1347b3bd0fe2f0f0cde9cfaa91 (diff) | |
| parent | af3147147f39274bd0d47faca196f84c4e9ec68d (diff) | |
Merge branch 'cb/maint-mergetool-no-tty'
* cb/maint-mergetool-no-tty:
mergetool: Remove explicit references to /dev/tty
Conflicts:
git-mergetool.sh
Diffstat (limited to 'git-remote-testgit.py')
0 files changed, 0 insertions, 0 deletions