diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-03 02:30:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-04 22:50:43 -0700 |
| commit | c7d849243a4be2c60ff48cc42ea8b0518bb7f27f (patch) | |
| tree | 49a8aa4deb18ccbfc50833bc2e02239d2810cd48 /merge-recursive.h | |
| parent | b7fa51da9be3cee9e2ca31af4edfec18b8ecbce7 (diff) | |
| download | git-c7d849243a4be2c60ff48cc42ea8b0518bb7f27f.tar.gz git-c7d849243a4be2c60ff48cc42ea8b0518bb7f27f.tar.xz | |
merge-recursive: move the global obuf 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 4f5537417..be84d9bb3 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -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 */ |