diff options
| author |  Heiko Voigt <hvoigt@hvoigt.net> | 2010-07-06 21:34:31 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-06 21:28:55 -0700 |
| commit | 420432d4342e214c15f063a630a883072d4e5779 (patch) | |
| tree | 0f656eec1ac51918387de97e3e7c21d57f6820c6 /t | |
| parent | test-date: fix sscanf type conversion (diff) | |
| download | tgif-420432d4342e214c15f063a630a883072d4e5779.tar.xz | |
add missing && to submodule-merge testcase
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 9a21f783d3..4a7b8933f4 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -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 && |