summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-11 23:19:58 -0600
committerJunio C Hamano <gitster@pobox.com>2011-08-14 14:19:35 -0700
commit70cc3d36eba58f8bf177c91d82781fb727a9a4fa (patch)
tree358742f2adb54e44bd2de52222a474760050e99a /merge-recursive.h
parentf2507b4e0ef0b7fc8c1e75004e8a86a0430dc512 (diff)
downloadgit-70cc3d36eba58f8bf177c91d82781fb727a9a4fa.tar.gz
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>
Diffstat (limited to 'merge-recursive.h')
-rw-r--r--merge-recursive.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index 7e1e972b13..58f3435e9e 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -26,6 +26,7 @@ struct merge_options {
struct strbuf obuf;
struct string_list current_file_set;
struct string_list current_directory_set;
+ struct string_list df_conflict_file_set;
};
/* merge_trees() but with recursive ancestor consolidation */