Merge branch 'rj/maint-difftool-cygwin-workaround'

diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 18376d66081759c6a4959a2d8bc47ca441364660..bafcca765e4fea92f430e7127506a2370e062ec7 100755 (executable)
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -91,7 +91,7 @@ test_expect_success 'setup' '
                prev=$cur &&
                cur=$(($cur+1))
        done &&
-       add B1 $A1
+       add B1 $A1 &&
        echo $ATIP > .git/refs/heads/A &&
        echo $BTIP > .git/refs/heads/B &&
        git symbolic-ref HEAD refs/heads/B