Merge branch 'cb/maint-mergetool-no-tty'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700)
commit1998f4c...966871d49ebf7f720dc58eb9f80771e9
tree5041817...d8834e6e9f3479bc01517c234317050fcopy hash to clipboard (tree)
parent9502751...81df4a1347b3bd0fe2f0f0cde9cfaa91copy hash to clipboard (diff)
parentaf31471...7f39274bd0d47faca196f84c4e9ec68dcopy hash to clipboard (diff)
git-mergetool.sh