diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-12-03 15:59:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:21:03 -0800 |
| commit | 101bc5bc2d73484d288a43fdcf1c00bc04b080e4 (patch) | |
| tree | 15ca7ff128c2b2748cd4599a2aa17e60850ba57c /Documentation/git-p4.txt | |
| parent | merge-ort: add a few includes (diff) | |
| download | tgif-101bc5bc2d73484d288a43fdcf1c00bc04b080e4.tar.xz | |
merge-ort: add a clear_internal_opts helper
Move most of merge_finalize() into a new helper function,
clear_internal_opts(). This is a step to facilitate recursive merges,
as well as some future optimizations.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
0 files changed, 0 insertions, 0 deletions