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

merge-recursive: move the global obuf to struct merge_options

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

1
merge-recursive.h
View File

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