t1430: remove refs using test-tool

[thirdparty/git.git] / git-mergetool.sh

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 911470a5b2c7aac6224964b7b0f39a3d72a9a985..f751d9cfe2090485914559d467578e8a68cc823c 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -358,13 +358,8 @@ merge_file () {
                    enabled=false
                fi
        else
-               # The user does not have a preference. Ask the tool.
-               if hide_resolved_enabled
-               then
-                   enabled=true
-               else
-                   enabled=false
-               fi
+               # The user does not have a preference. Default to disabled.
+               enabled=false
        fi
 
        if test "$enabled" = true