summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-09-02 21:30:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-04 02:06:17 (GMT)
commit5033639c951da27fc4d4becbc3e46dc05096ce63 (patch)
treed2ac86b6317628604cb1329b6e835f70404789f0 /merge-recursive.h
parent6eb1b437933e075bd84c5cdcf5de95ed4db4820f (diff)
downloadgit-5033639c951da27fc4d4becbc3e46dc05096ce63.zip
git-5033639c951da27fc4d4becbc3e46dc05096ce63.tar.gz
git-5033639c951da27fc4d4becbc3e46dc05096ce63.tar.bz2
merge-recursive: move call_depth to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Diffstat (limited to 'merge-recursive.h')
-rw-r--r--merge-recursive.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index 72f0a28..4f55374 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 */