Age | Commit message (Expand) | Author |
---|---|---|
2022-06-22 | merge-tree: add a --allow-unrelated-histories flag | Elijah Newren |
2022-06-22 | merge-tree: allow `ls-files -u` style info to be NUL terminated | Elijah Newren |
2022-06-22 | merge-tree: provide easy access to `ls-files -u` style info | Elijah Newren |
2022-06-22 | merge-tree: provide a list of which files have conflicts | Elijah Newren |
2022-06-22 | merge-tree: support including merge messages in output | Elijah Newren |
2022-06-22 | merge-tree: implement real merges | Elijah Newren |