From c7d849243a4be2c60ff48cc42ea8b0518bb7f27f Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 3 Sep 2008 02:30:03 +0200 Subject: merge-recursive: move the global obuf to struct merge_options Signed-off-by: Miklos Vajna --- merge-recursive.h | 1 + 1 file changed, 1 insertion(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index 4f5537417e..be84d9bb32 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -10,6 +10,7 @@ struct merge_options { int diff_rename_limit; int merge_rename_limit; int call_depth; + struct strbuf obuf; }; /* merge_trees() but with recursive ancestor consolidation */ -- cgit v1.2.1