Searched refs:record_conflicted_index_entries (Results 1 – 5 of 5) sorted by relevance
4066 static int record_conflicted_index_entries(struct merge_options *opt) in record_conflicted_index_entries() function4221 if (record_conflicted_index_entries(opt)) { in merge_switch_to_result()