summaryrefslogtreecommitdiff
path: root/merge-ort.h
Commit message (Expand)AuthorAgeFilesLines
* merge-ort: optionally produce machine-readable outputElijah Newren2022-06-221-0/+1
* merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin2022-06-221-1/+1
* merge-ort: store messages in a list, not in a single strbufJohannes Schindelin2022-06-221-1/+1
* merge-ort: provide a merge_get_conflicted_files() helper functionElijah Newren2022-06-221-0/+21
* merge-ort: split out a separate display_update_messages() functionElijah Newren2022-06-221-0/+8
* show, log: include conflict/warning messages in --remerge-diff headersElijah Newren2022-02-021-0/+10
* merge-ort: avoid accidental API mis-useElijah Newren2021-05-201-0/+2
* merge-ort: implement merge_incore_recursive()Elijah Newren2020-12-161-0/+10
* merge-ort: add an err() function similar to one from merge-recursiveElijah Newren2020-12-131-1/+8
* merge-ort: barebones API of new merge strategy with empty implementationElijah Newren2020-10-261-0/+58