summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-12-13 08:04:27 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-13 14:18:20 -0800
commit89422d29b1d63004683aaa6d11faa65ba734d46f (patch)
tree6ee9f2dee9360d9e7467bd43018c485c3442ebba /xdiff
parentmerge-ort: add implementation of record_conflicted_index_entries() (diff)
downloadtgif-89422d29b1d63004683aaa6d11faa65ba734d46f.tar.xz
merge-ort: free data structures in merge_finalize()
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions