Junio C Hamano 8ba8642bd5 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

2018-08-17 13:09:57 -07:00

79 KiB

Raw Blame History

View Raw