summaryrefslogtreecommitdiffstats
path: root/decorate.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-01 21:58:57 +0200
committerJunio C Hamano <gitster@pobox.com>2012-10-01 21:58:57 +0200
commit5ec11ab39d11aecd731044955a7a4f7e925cdba6 (patch)
tree87432ee7fd9345d922f2fa7d182246125cc3b61d /decorate.h
parentMerge branch 'os/commit-submodule-ignore' (diff)
parentmergetool--lib: Allow custom commands to override built-ins (diff)
downloadgit-5ec11ab39d11aecd731044955a7a4f7e925cdba6.tar.xz
git-5ec11ab39d11aecd731044955a7a4f7e925cdba6.zip
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
Diffstat (limited to 'decorate.h')
0 files changed, 0 insertions, 0 deletions