Merge branch 'jn/plug-empty-tree-leak'

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 91f90acfba2a710644f4a076d27d50e0fbb33c2d..9a89e8f31981a0c82cf25ab6c75a6f841c7ba79b 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -79,7 +79,7 @@ get_merge_tool_cmd () {
        fi
        if diff_mode; then
                echo "$(git config difftool.$merge_tool.cmd ||
-                       git config mergetool.$merge_tool.cmd)"
+                       git config mergetool.$merge_tool.cmd)"
        else
                echo "$(git config mergetool.$merge_tool.cmd)"
        fi
@@ -419,7 +419,7 @@ get_merge_tool_path () {
        fi
        if diff_mode; then
                merge_tool_path=$(git config difftool."$merge_tool".path ||
-                                 git config mergetool."$merge_tool".path)
+                                 git config mergetool."$merge_tool".path)
        else
                merge_tool_path=$(git config mergetool."$merge_tool".path)
        fi
@@ -429,7 +429,7 @@ get_merge_tool_path () {
        if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
        ! type "$merge_tool_path" > /dev/null 2>&1; then
                echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
-                        "'$merge_tool_path'"
+                        "'$merge_tool_path'"
                exit 1
        fi
        echo "$merge_tool_path"