Commit Graph

10 Commits (master)

Author SHA1 Message Date
Elijah Newren de90581141 merge-ort: optionally produce machine-readable output 3 months ago
Johannes Schindelin 2715e8a931 merge-ort: make `path_messages` a strmap to a string_list 3 months ago
Johannes Schindelin 6debb7527b merge-ort: store messages in a list, not in a single strbuf 3 months ago
Elijah Newren fae26ce79c merge-ort: provide a merge_get_conflicted_files() helper function 3 months ago
Elijah Newren a34edae68a merge-ort: split out a separate display_update_messages() function 3 months ago
Elijah Newren 20323d104e show, log: include conflict/warning messages in --remerge-diff headers 8 months ago
Elijah Newren 19ceb486f8 merge-ort: avoid accidental API mis-use 1 year ago
Elijah Newren 8119214f4e merge-ort: implement merge_incore_recursive() 2 years ago
Elijah Newren 0c0d705b5c merge-ort: add an err() function similar to one from merge-recursive 2 years ago
Elijah Newren 17e5574b04 merge-ort: barebones API of new merge strategy with empty implementation 2 years ago