Merge branch 'da/mergetool-tool-help'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:37 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:37 +0000 (13:28 -0700)
commite96e98b...399ae4c638466f84068fe94d4712c5a3
tree55cee4b...2db5239c5f1b2070509c261b378f55f3copy hash to clipboard (tree)
parent02f4db8...bd979fe33f18006fa612d7d5ab1d2470copy hash to clipboard (diff)
parent4fb4b02...98310f4f859f7d52f57f36d49198be5ccopy hash to clipboard (diff)
git-mergetool.sh
git-sh-setup.sh