Merge branch 'da/difftool-updates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 18:55:16 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 18:55:17 +0000 (11:55 -0700)
commitde54ef2...24882f151d71f996991b4c634b6abf41
tree51f5d32...b31c7d200fd9d37f5ed218c0b5ddb44dcopy hash to clipboard (tree)
parent445d2c5...a4b6883d6a7b14228d5de0bb22a09d8ecopy hash to clipboard (diff)
parented36e5b...41f7192e42e9b4c573875a343a9daf48copy hash to clipboard (diff)
Documentation/git-mergetool.txt
contrib/completion/git-completion.bash
git-mergetool--lib.sh