mergetool: honor mergetool.$tool.trustExitCode for built-in tools

diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 74ea6d54793f62188cd88e93f1adfe74c5957dda..a841ffdb492dd9bdbd7a65238786fff44684d20b 100644 (file)
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -4,7 +4,6 @@ diff_cmd () {
 }
 
 merge_cmd () {
-       touch "$BACKUP"
        case "$1" in
        gvimdiff|vimdiff)
                if $base_present
@@ -31,7 +30,6 @@ merge_cmd () {
                fi
                ;;
        esac
-       check_unchanged
 }
 
 translate_merge_tool_path() {