]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c5d276c ad37620)
Merge branch 'en/abort-df-conflict-fixes'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:57 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:57 +0000 (13:09 -0700)
commit8ba8642bd5d89629973268ff28bc5b0b3d45e35b
tree19a0cf51bfa72424d0c9d746851092115747ada0tree | snapshot
parentc5d276cb184cc42fb90b60b14996253b855a3e06commit | diff
parentad3762042a8d0029ff16bcbfbb2656c36cf3d662commit | diff
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
read-cache.c diff1 | diff2 | blob | history
t/t6042-merge-rename-corner-cases.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.