diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-17 22:09:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 22:09:57 +0200 |
| commit | 8ba8642bd5d89629973268ff28bc5b0b3d45e35b (patch) | |
| tree | 19a0cf51bfa72424d0c9d746851092115747ada0 /t/t6042-merge-rename-corner-cases.sh | |
| parent | Merge branch 'mk/http-backend-content-length' (diff) | |
| parent | read-cache: fix directory/file conflict handling in read_index_unmerged() (diff) | |
| download | git-8ba8642bd5d89629973268ff28bc5b0b3d45e35b.tar.xz git-8ba8642bd5d89629973268ff28bc5b0b3d45e35b.zip | |
Merge branch 'en/abort-df-conflict-fixes'
"git merge --abort" etc. did not clean things up properly when
there were conflicted entries in the index in certain order that
are involved in D/F conflicts. This has been corrected.
* en/abort-df-conflict-fixes:
read-cache: fix directory/file conflict handling in read_index_unmerged()
t1015: demonstrate directory/file conflict recovery failures
Diffstat (limited to 't/t6042-merge-rename-corner-cases.sh')
| -rwxr-xr-x | t/t6042-merge-rename-corner-cases.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 07dd09d985..b97aca7fa2 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -324,7 +324,6 @@ test_expect_success 'rename/directory conflict + content merge conflict' ' cd rename-directory-1 && git reset --hard && - git reset --hard && git clean -fdqx && git checkout left-conflict^0 && |