Skip to content

Commit

Permalink
add missing && to submodule-merge testcase
Browse files Browse the repository at this point in the history
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Heiko Voigt authored and Junio C Hamano committed Jul 7, 2010
1 parent d66ee04 commit 420432d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t7405-submodule-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ test_expect_success setup '
git commit -m sub-b) &&
git add sub &&
test_tick &&
git commit -m b
git commit -m b &&
git checkout -b c a &&
git merge -s ours b &&
Expand Down

0 comments on commit 420432d

Please sign in to comment.