vimdiff: make script and tests work with zsh

[thirdparty/git.git] / mergetools / vimdiff

diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 97e376329bf510fce8c70c89a6de7a5465190d2b..734d15a03b025e537650ee535cfa8c5f70e2474c 100644 (file)
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -72,7 +72,6 @@ gen_cmd_aux () {
        nested=0
        nested_min=100
 
-
        # Step 1:
        #
        # Increase/decrease "start"/"end" indices respectively to get rid of
@@ -87,7 +86,7 @@ gen_cmd_aux () {
        IFS=#
        for c in $(echo "$LAYOUT" | sed 's:.:&#:g')
        do
-               if test "$c" = " "
+               if test -z "$c" || test "$c" = " "
                then
                        continue
                fi