summaryrefslogtreecommitdiff
path: root/t/t4301-merge-tree-write-tree.sh
AgeCommit message (Expand)Author
2022-06-22merge-tree: add a --allow-unrelated-histories flagElijah Newren
2022-06-22merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren
2022-06-22merge-tree: provide easy access to `ls-files -u` style infoElijah Newren
2022-06-22merge-tree: provide a list of which files have conflictsElijah Newren
2022-06-22merge-tree: support including merge messages in outputElijah Newren
2022-06-22merge-tree: implement real mergesElijah Newren