diff options
| author |  Ramsay Jones <ramsay@ramsayjones.plus.com> | 2018-07-12 16:32:25 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-12 11:48:52 -0700 |
| commit | 6b82db9b4267ed232755d20487c42d25eaf14816 (patch) | |
| tree | c8c66eff910876d8415224ed29591e347682f9e8 | |
| parent | t6036: add lots of detail for directory/file conflicts in recursive case (diff) | |
| download | tgif-6b82db9b4267ed232755d20487c42d25eaf14816.tar.xz | |
t6036: fix broken && chain in sub-shell
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 74e5920bc6..ef1c26ec58 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict test_write_lines 1 2 3 4 5 6 7 8 >a && git add a && git commit -m E3 && - git tag E3 + git tag E3 && git checkout C^0 && test_must_fail git merge B^0 && |