development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

add missing && to submodule-merge testcase

Browse source 
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Heiko Voigt 2010-07-06 21:34:31 +02:00 committed by Junio C Hamano
parent d66ee046fc
commit 420432d434
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t7405-submodule-merge.sh
View file

@ -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 &&