projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6975991 a427ef7)
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)
commit5ec11ab39d11aecd731044955a7a4f7e925cdba6
tree87432ee7fd9345d922f2fa7d182246125cc3b61dtree | snapshot
parent69759917aa4b1efb5bf198e76c3664bed9c70d4dcommit | diff
parenta427ef7acc9d932d1c203dd2fae67f51c4b1d1e8commit | diff
Merge branch 'da/mergetool-custom'

The actual external command to run for mergetool backend can be
specified with difftool/mergetool.$name.cmd configuration
variables, but this mechanism was ignored for the backends we
natively support.

* da/mergetool-custom:
  mergetool--lib: Allow custom commands to override built-ins
git-mergetool--lib.sh diff1 | diff2 | blob | history
t/t7610-mergetool.sh diff1 | diff2 | blob | history
Git—the stupid content tracker