Merge branch 'bc/zsh-compatibility'

zsh can pretend to be a normal shell pretty well except for some
glitches that we tickle in some of our scripts. Work them around
so that "vimdiff" and our test suite works well enough with it.

* bc/zsh-compatibility:
  vimdiff: make script and tests work with zsh
  t4046: avoid continue in &&-chain for zsh

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

t/t4046-diff-unmerged.sh

@@ -20,13 +20,15 @@ test_expect_success setup '
 			for t in o x
 			do
 				path="$b$o$t" &&
-				case "$path" in ooo) continue ;; esac &&
+				if test "$path" != ooo
-				paths="$paths$path " &&
+				then
-				p="	$path" &&
+					paths="$paths$path " &&
-				case "$b" in x) echo "$m1$p" ;; esac &&
+					p="	$path" &&
-				case "$o" in x) echo "$m2$p" ;; esac &&
+					case "$b" in x) echo "$m1$p" ;; esac &&
-				case "$t" in x) echo "$m3$p" ;; esac ||
+					case "$o" in x) echo "$m2$p" ;; esac &&
-				return 1
+					case "$t" in x) echo "$m3$p" ;; esac ||
+					return 1
+				fi
 			done
 		done
 	done >ls-files-s.expect &&