diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-02 23:30:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-04 04:06:17 +0200 |
| commit | 5033639c951da27fc4d4becbc3e46dc05096ce63 (patch) | |
| tree | d2ac86b6317628604cb1329b6e835f70404789f0 /merge-recursive.h | |
| parent | cherry-pick/revert: make direct internal call to merge_tree() (diff) | |
| download | git-5033639c951da27fc4d4becbc3e46dc05096ce63.tar.xz git-5033639c951da27fc4d4becbc3e46dc05096ce63.zip | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |