From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Oct 2012 19:58:57 +0000 (-0700)
Subject: Merge branch 'da/mergetool-custom'
X-Git-Tag: v1.8.0-rc0~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ec11ab39d11aecd731044955a7a4f7e925cdba6;p=git.git

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
---

5ec11ab39d11aecd731044955a7a4f7e925cdba6