X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-mergetool.sh;h=b52a7410bcb7b37dce0f4d6213dddedd2c1e42e7;hb=eb80042c6a631aee74bd0d1b1dd845784e9788cd;hp=2e3e02b3b5b45af781fea529e9f3f68fce4a9bd0;hpb=70af4e9bef988a98061237c78cbd0a71d8de48bb;p=git.git

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 2e3e02b3b..b52a7410b 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -174,9 +174,11 @@ merge_file () {
 	read ans
     fi
 
-    present=false
-    base_present &&
-    present=true
+    if base_present; then
+	    present=true
+    else
+	    present=false
+    fi
 
     if ! run_merge_tool "$merge_tool" "$present"; then
 	echo "merge of $MERGED failed" 1>&2
@@ -254,12 +256,11 @@ prompt_after_failed_merge() {
     done
 }
 
-merge_tool=$(get_merge_tool "$merge_tool") || exit
-merge_tool_cmd="$(get_merge_tool_cmd "$merge_tool")"
-merge_tool_path="$(get_merge_tool_path "$merge_tool")" || exit
+if test -z "$merge_tool"; then
+    merge_tool=$(get_merge_tool "$merge_tool") || exit
+fi
 merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
 merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
-merge_tool_trust_exit_code="$(git config --bool mergetool."$merge_tool".trustExitCode || echo false)"
 
 last_status=0
 rollup_status=0