mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: Save D/F conflict filenames instead of unlinking them

Browse Source 
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>
This commit is contained in:
Elijah Newren
2011-08-11 23:19:58 -06:00
committed by Junio C Hamano
parent f2507b4e0e
commit 70cc3d36eb
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
merge-recursive.h
View File

@ -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 */