diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-03 19:08:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-04 22:50:43 -0700 |
| commit | 696ee23cc1817a5064780600374589d3a773a081 (patch) | |
| tree | 3cd9127b5fb52918ef3458d40a15bd888738826a /merge-recursive.h | |
| parent | c7d849243a4be2c60ff48cc42ea8b0518bb7f27f (diff) | |
| download | git-696ee23cc1817a5064780600374589d3a773a081.tar.gz git-696ee23cc1817a5064780600374589d3a773a081.tar.xz | |
merge-recursive: move current_{file,directory}_set to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index be84d9bb3..fd138ca14 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -1,6 +1,8 @@ #ifndef MERGE_RECURSIVE_H #define MERGE_RECURSIVE_H +#include "string-list.h" + struct merge_options { const char *branch1; const char *branch2; @@ -11,6 +13,8 @@ struct merge_options { int merge_rename_limit; int call_depth; struct strbuf obuf; + struct string_list current_file_set; + struct string_list current_directory_set; }; /* merge_trees() but with recursive ancestor consolidation */ |