mergetool--lib: Allow custom commands to override built-ins
authorDavid Aguilar <davvid@gmail.com>
Tue, 25 Sep 2012 07:48:11 +0000 (00:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2012 16:04:39 +0000 (09:04 -0700)
commita427ef7...cc9d932d1c203dd2fae67f51c4b1d1e8
treeec1f72c...31d37983ae461a9211c32f806fb381d9copy hash to clipboard (tree)
parent889d358...9ba64640e47798681ecb34a4be043badcopy hash to clipboard (diff)
git-mergetool--lib.sh
mergetools/defaults
t/t7610-mergetool.sh
t/t7800-difftool.sh