diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-08-17 11:41:30 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-19 10:08:03 -0700 |
| commit | b4db8a2b768742f4f43d4a6cdb1db39c2ffc9f7f (patch) | |
| tree | ed09adf5db7d6e254b5fb76172426f33336b0b15 /builtin/diff-index.c | |
| parent | merge-recursive: exit early if index != head (diff) | |
| download | tgif-b4db8a2b768742f4f43d4a6cdb1db39c2ffc9f7f.tar.xz | |
merge-recursive: remove useless parameter in merge_trees()
merge_trees() took a results parameter that would only be written when
opt->call_depth was positive, which is never the case now that
merge_trees_internal() has been split from merge_trees(). Remove the
misleading and unused parameter from merge_trees().
While at it, add some comments explaining how the output of
merge_trees() and merge_recursive() differ.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff-index.c')
0 files changed, 0 insertions, 0 deletions