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