While working on a series to make file collision conflict handling consistent, I discovered a latent bug in merge_content()...and several opportunities for cleanup. This series fixes that bug, deletes the merge_file_special_markers() and merge_file_one() functions, and renames a pair of functions to make them have a better description. Elijah Newren (4): merge-recursive: set paths correctly when three-way merging content merge-recursive: avoid wrapper function when unnecessary and wasteful merge-recursive: remove final remaining caller of merge_file_one() merge-recursive: rename merge_file_1() and merge_content() merge-recursive.c | 144 ++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 93 deletions(-) -- 2.19.0.12.gc6760fd9a9
