| Age | Commit message (Expand) | Author |
|---|---|---|
| 2022-06-22 | merge-ort: optionally produce machine-readable output | Elijah Newren |
| 2022-06-22 | merge-ort: make `path_messages` a strmap to a string_list | Johannes Schindelin |
| 2022-06-22 | merge-ort: store messages in a list, not in a single strbuf | Johannes Schindelin |
| 2022-06-22 | merge-ort: provide a merge_get_conflicted_files() helper function | Elijah Newren |
| 2022-06-22 | merge-ort: split out a separate display_update_messages() function | Elijah Newren |
| 2022-02-02 | show, log: include conflict/warning messages in --remerge-diff headers | Elijah Newren |
| 2021-05-20 | merge-ort: avoid accidental API mis-use | Elijah Newren |
| 2020-12-17 | merge-ort: implement merge_incore_recursive() | Elijah Newren |
| 2020-12-13 | merge-ort: add an err() function similar to one from merge-recursive | Elijah Newren |
| 2020-10-27 | merge-ort: barebones API of new merge strategy with empty implementation | Elijah Newren |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |
path: root/merge-ort.h