mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: move call_depth to struct merge_options

Browse Source 
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
This commit is contained in:
Miklos Vajna
2008-09-02 23:30:09 +02:00
committed by Junio C Hamano
parent 6eb1b43793
commit 5033639c95
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
merge-recursive.h
View File

@ -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 */