Elijah Newren 70cc3d36eb merge-recursive: Save D/F conflict filenames instead of unlinking them ...

Rename make_room_for_directories_of_df_conflicts() to
record_df_conflict_files() to reflect the change in functionality.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2011-08-14 14:19:35 -07:00

1.7 KiB

Raw Blame History

View Raw