summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-01 19:58:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-01 19:58:57 (GMT)
commit5ec11ab39d11aecd731044955a7a4f7e925cdba6 (patch)
tree87432ee7fd9345d922f2fa7d182246125cc3b61d /mergetools
parent69759917aa4b1efb5bf198e76c3664bed9c70d4d (diff)
parenta427ef7acc9d932d1c203dd2fae67f51c4b1d1e8 (diff)
downloadgit-5ec11ab39d11aecd731044955a7a4f7e925cdba6.zip
git-5ec11ab39d11aecd731044955a7a4f7e925cdba6.tar.gz
git-5ec11ab39d11aecd731044955a7a4f7e925cdba6.tar.bz2
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 'mergetools')
-rw-r--r--mergetools/defaults28
1 files changed, 2 insertions, 26 deletions
diff --git a/mergetools/defaults b/mergetools/defaults
index 1d8f2a3..21e63ec 100644
--- a/mergetools/defaults
+++ b/mergetools/defaults
@@ -8,36 +8,12 @@ can_diff () {
}
diff_cmd () {
- merge_tool_cmd="$(get_merge_tool_cmd "$1")"
- if test -z "$merge_tool_cmd"
- then
- status=1
- break
- fi
- ( eval $merge_tool_cmd )
- status=$?
+ status=1
return $status
}
merge_cmd () {
- merge_tool_cmd="$(get_merge_tool_cmd "$1")"
- if test -z "$merge_tool_cmd"
- then
- status=1
- break
- fi
- trust_exit_code="$(git config --bool \
- mergetool."$1".trustExitCode || echo false)"
- if test "$trust_exit_code" = "false"
- then
- touch "$BACKUP"
- ( eval $merge_tool_cmd )
- status=$?
- check_unchanged
- else
- ( eval $merge_tool_cmd )
- status=$?
- fi
+ status=1
return $status
}