From 696ee23cc1817a5064780600374589d3a773a081 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 3 Sep 2008 19:08:56 +0200 Subject: merge-recursive: move current_{file,directory}_set to struct merge_options Signed-off-by: Miklos Vajna --- merge-recursive.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index be84d9bb32..fd138ca140 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 */ -- cgit v1.2.1