| commit | 70cc3d36eba58f8bf177c91d82781fb727a9a4fa | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:19:58 +0000 (11 23:19 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:35 +0000 (14 14:19 -0700) | ||
| tree | 358742f2adb54e44bd2de52222a474760050e99a | treesnapshot (tar.gz zip) |
| parent | f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory |