Andrew's git / gitweb.git / diff
?
merge-recursive: Save D/F conflict filenames instead of unlinking them
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:58 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:35 +0000 (14:19 -0700)
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>
No differences found