diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 07:19:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 23:19:35 +0200 |
| commit | 70cc3d36eba58f8bf177c91d82781fb727a9a4fa (patch) | |
| tree | 358742f2adb54e44bd2de52222a474760050e99a /merge-recursive.h | |
| parent | merge-recursive: Fix code checking for D/F conflicts still being present (diff) | |
| download | git-70cc3d36eba58f8bf177c91d82781fb727a9a4fa.tar.xz git-70cc3d36eba58f8bf177c91d82781fb727a9a4fa.zip | |
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.h | 1 |
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 */ |