Merge branch 'maint'

diff --git a/mergetools/defaults b/mergetools/defaults
index 1d8f2a3dd3d0370461423007ed2198918836181b..21e63ecc3e019252c5c9ab5c26b1ea72f5952cc7 100644 (file)
--- 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
 }