summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:57 -0700
commit8ba8642bd5d89629973268ff28bc5b0b3d45e35b (patch)
tree19a0cf51bfa72424d0c9d746851092115747ada0 /Documentation/diff-options.txt
parentMerge branch 'mk/http-backend-content-length' (diff)
parentread-cache: fix directory/file conflict handling in read_index_unmerged() (diff)
downloadtgif-8ba8642bd5d89629973268ff28bc5b0b3d45e35b.tar.xz
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 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions