Searched refs:locate_merge (Results 1 – 2 of 2) sorted by relevance
46 locate_merge (lin *matched) in locate_merge() function229 where = locate_merge (&matched); in merge_hunk()
740 * src/merge.c (locate_merge): Make sure to return a line number881 * src/merge.c (locate_merge): Add similar asymmetric hunk check here.897 (locate_merge): Add a note about the algorithm's requirements.917 * merge.c (locate_merge): Include the number of changes in the debug963 * merge.c (locate_merge, count_fuzz_lines): New functions.964 (merge_hunk): Replace simple guessing with locate_merge().988 * merge.c (locate_merge): The number of changes allowed permits a