summaryrefslogtreecommitdiff
path: root/write-or-die.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-01-10 11:52:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-10 11:52:55 -0800
commit2c5410480ea7ea92e39667fedc8eba1f7a95bc9e (patch)
tree5596e9549e0ce5730a2b74f87be407d55b2dd249 /write-or-die.c
parentMerge branch 'jc/doc-submitting-patches-choice-of-base' (diff)
parentmerge-ort: fix bug with renormalization and rename/delete conflicts (diff)
downloadtgif-2c5410480ea7ea92e39667fedc8eba1f7a95bc9e.tar.xz
Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'
A corner case bug in the ort merge strategy has been corrected. * en/merge-ort-renorm-with-rename-delete-conflict-fix: merge-ort: fix bug with renormalization and rename/delete conflicts
Diffstat (limited to 'write-or-die.c')
0 files changed, 0 insertions, 0 deletions