From 5033639c951da27fc4d4becbc3e46dc05096ce63 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 2 Sep 2008 23:30:09 +0200 Subject: merge-recursive: move call_depth 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 72f0a2895d..4f5537417e 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -9,6 +9,7 @@ struct merge_options { int verbosity; int diff_rename_limit; int merge_rename_limit; + int call_depth; }; /* merge_trees() but with recursive ancestor consolidation */ -- cgit v1.2.1