diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-06 21:29:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-06 21:29:21 -0700 |
| commit | 78db709ae59da26de76264b79df3a7dc4d87e65c (patch) | |
| tree | e96f2af98f008112b74b3c7649ff723e8a1160ed /t | |
| parent | 5b5275f6e9ca6284ca123f729d5a78f409e448fb (diff) | |
| parent | 420432d4342e214c15f063a630a883072d4e5779 (diff) | |
| download | git-78db709ae59da26de76264b79df3a7dc4d87e65c.tar.gz git-78db709ae59da26de76264b79df3a7dc4d87e65c.tar.xz | |
Merge branch 'maint'
* maint:
add missing && to submodule-merge testcase
test-date: fix sscanf type conversion
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 9a21f783d..4a7b8933f 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 && |