projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f2507b4) | patch
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)
commit70cc3d36eba58f8bf177c91d82781fb727a9a4fa
tree358742f2adb54e44bd2de52222a474760050e99atree | snapshot
parentf2507b4e0ef0b7fc8c1e75004e8a86a0430dc512commit | diff
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>
merge-recursive.c diff | blob | history
merge-recursive.h diff | blob | history
Git—the stupid content tracker