summaryrefslogtreecommitdiff
path: root/merge-ort.h
AgeCommit message (Expand)AuthorFilesLines
2020-12-13merge-ort: add an err() function similar to one from merge-recursiveLibravatar Elijah Newren1-1/+8
2020-10-26merge-ort: barebones API of new merge strategy with empty implementationLibravatar Elijah Newren1-0/+58