Merge branch 'cb/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Jan 2009 13:48:40 +0000 (05:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Jan 2009 13:48:40 +0000 (05:48 -0800)
commit3827210...91a7d363ea67bcf0b9c6ee1c91d2f3c5
treed142cd6...49c93a48abd928ddeb809d23c952d08fcopy hash to clipboard (tree)
parent42e778b...ec68d251b777c6b8444cda4bc51332becopy hash to clipboard (diff)
parent162eba8...43a0e665c8e3439191981412815cc6dbcopy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-mergetool.txt
git-mergetool.sh