Merge branch 'da/mergetool-custom'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Oct 2012 19:58:57 +0000 (12:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Oct 2012 19:58:57 +0000 (12:58 -0700)
commit5ec11ab...9d11aecd731044955a7a4f7e925cdba6
tree87432ee...fd9345d922f2fa7d182246125cc3b61dcopy hash to clipboard (tree)
parent6975991...aa4b1efb5bf198e76c3664bed9c70d4dcopy hash to clipboard (diff)
parenta427ef7...cc9d932d1c203dd2fae67f51c4b1d1e8copy hash to clipboard (diff)
git-mergetool--lib.sh
t/t7610-mergetool.sh