summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2020-12-13merge-ort: avoid repeating fill_tree_descriptor() on the same treeLibravatar Elijah Newren1-4/+22
2020-12-13merge-ort: implement a very basic collect_merge_info()Libravatar Elijah Newren1-1/+134
2020-12-13merge-ort: add an err() function similar to one from merge-recursiveLibravatar Elijah Newren1-2/+29
2020-12-13merge-ort: use histogram diffLibravatar Elijah Newren1-0/+4
2020-12-13merge-ort: port merge_start() from merge-recursiveLibravatar Elijah Newren1-1/+44
2020-12-13merge-ort: add some high-level algorithm structureLibravatar Elijah Newren1-1/+67
2020-12-13merge-ort: setup basic internal data structuresLibravatar Elijah Newren1-0/+147
2020-10-26merge-ort: barebones API of new merge strategy with empty implementationLibravatar Elijah Newren1-0/+52