diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-02 00:24:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 21:38:47 (GMT) |
| commit | c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7 (patch) | |
| tree | e521ef6a568f3e33f4c804e47fd38f3449065d00 /t/t6036-recursive-corner-cases.sh | |
| parent | 51b85471af1d2df88749e8a7aa424a879e33a9d7 (diff) | |
| download | git-c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7.zip git-c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7.tar.gz git-c8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7.tar.bz2 | |
t6000-t6999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index b32ff8e..892cf08 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -72,7 +72,7 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' ' git rev-parse >actual \ :2:three :3:three && git hash-object >>actual \ - three~HEAD three~R2^0 + three~HEAD three~R2^0 && test_cmp expect actual ) ' @@ -148,7 +148,7 @@ test_expect_success 'merge criss-cross + rename merges with basic modification' git rev-parse >actual \ :2:three :3:three && git hash-object >>actual \ - three~HEAD three~R2^0 + three~HEAD three~R2^0 && test_cmp expect actual ) ' @@ -228,7 +228,7 @@ test_expect_success 'git detects differently handled merges conflict' ' D:new_a E:new_a && git rev-parse >actual \ :2:new_a :3:new_a && - test_cmp expect actual + test_cmp expect actual && git cat-file -p B:new_a >ours && git cat-file -p C:new_a >theirs && |