summaryrefslogtreecommitdiff
path: root/merge-ort.h
AgeCommit message (Expand)Author
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersElijah Newren
2021-05-20merge-ort: avoid accidental API mis-useElijah Newren
2020-12-17merge-ort: implement merge_incore_recursive()Elijah Newren
2020-12-13merge-ort: add an err() function similar to one from merge-recursiveElijah Newren
2020-10-27merge-ort: barebones API of new merge strategy with empty implementationElijah Newren