This is a small preparatory step to build a new merge strategy based on the disused merge-tree proof-of-concept code. It starts with a small set of code clean-up patches and ends with two bugfixes, at least for now.
Junio C Hamano (5): Which merge_file() function do you mean? merge-tree: lose unused "flags" from merge_list merge-tree: lose unused "resolve_directories" merge-tree: add comments to clarify what these functions are doing merge-tree: fix d/f conflicts Makefile | 2 +- builtin/merge-index.c | 4 +- builtin/merge-tree.c | 92 +++++++++++++++++++++++-------------- merge-blobs.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ merge-blobs.h | 8 ++++ merge-file.c | 124 -------------------------------------------------- merge-file.h | 7 --- merge-recursive.c | 6 +-- t/t4300-merge-tree.sh | 44 ++++++++++++++++++ 9 files changed, 239 insertions(+), 172 deletions(-) create mode 100644 merge-blobs.c create mode 100644 merge-blobs.h delete mode 100644 merge-file.c delete mode 100644 merge-file.h -- 1.8.1.rc3.356.g686f81c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
