merge hook tests: fix missing '&&' in test

Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Benoit Pierre committed Mar 10, 2014 at 19:49 UTC 3219bad94422084184987c9660361f3245d69f04
1 file changed +1 -1
t/t7505-prepare-commit-msg-hook.sh
+1 -1
@@ -174,7 +174,7 @@ test_expect_success 'with failing hook (merge)' '
174 git add file &&
175 rm -f "$HOOK" &&
176 git commit -m other &&
177 - write_script "$HOOK" <<-EOF
177 + write_script "$HOOK" <<-EOF &&
178 exit 1
179 EOF
180 git checkout - &&