summaryrefslogtreecommitdiffstats
path: root/merge-ll.h (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge options: add a conflict style memberPhillip Wood2024-03-141-1/+4
* merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood2024-03-141-0/+2
* merge-ll: rename from ll-mergeElijah Newren2023-06-211-0/+109