1
0
mirror of https://github.com/git/git.git synced 2024-10-19 21:08:12 +02:00

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>
This commit is contained in:
Benoit Pierre 2014-03-10 19:49:31 +01:00 committed by Junio C Hamano
parent 5f95c9f850
commit 3219bad944

@ -174,7 +174,7 @@ test_expect_success 'with failing hook (merge)' '
git add file &&
rm -f "$HOOK" &&
git commit -m other &&
write_script "$HOOK" <<-EOF
write_script "$HOOK" <<-EOF &&
exit 1
EOF
git checkout - &&