Merge branch 'ss/mergetool--lib'
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:24:27 +0000 (23:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:24:27 +0000 (23:24 -0700)
commit9d59e66...7a597a0a934566bfa547b45c7b57822c
treec3ff191...57256ec88cfb7f770e5b10554c16e34dcopy hash to clipboard (tree)
parentf4784b3...ab2e12e7a8fda7431572753f3a970c63copy hash to clipboard (diff)
parentffe6dc0...1aa23d56e6306d143d99ca508db38c5ecopy hash to clipboard (diff)
Documentation/git-difftool.txt
Documentation/git-mergetool.txt
contrib/completion/git-completion.bash
git-mergetool--lib.sh