diff options
| author |  Miklos Vajna <vmiklos@frugalware.org> | 2008-09-02 23:30:09 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-09-03 19:06:17 -0700 |
| commit | 5033639c951da27fc4d4becbc3e46dc05096ce63 (patch) | |
| tree | d2ac86b6317628604cb1329b6e835f70404789f0 /diff-no-index.c | |
| parent | cherry-pick/revert: make direct internal call to merge_tree() (diff) | |
| download | tgif-5033639c951da27fc4d4becbc3e46dc05096ce63.tar.xz | |
merge-recursive: move call_depth to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions