Elijah Newren <newren@xxxxxxxxx> writes: > ... The reason this change works is due to the changes of the > last few patches to (a) record_df_conflict_files instead of just unlinking > them early, (b) allowing make_room_for_path() to remove D/F entries, and > (c) the splitting of update_stages_and_entry() to have its functionality > called at different points. Nice. -- 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