diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7201-co.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 3d8e01c030..5492f21c7e 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -103,13 +103,6 @@ test_expect_success "checkout -m with dirty tree" ' test "$(git symbolic-ref HEAD)" = "refs/heads/side" && (cat >expect.messages <<EOF -Merging side with local -Merging: -ab76817 Side M one, D two, A three -virtual local -found 1 common ancestor(s): -7329388 Initial A one, A two -Auto-merged one M one EOF ) && |