Nit, add_part_to_conflict_entry(), create_new_conflict() and related structures/macros are not used in this patch. The first caller is in the next patch (read resolve-undo data). -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html