diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-12-03 15:59:42 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:38:40 -0800 |
| commit | 1c7873cdf4a7e84755c54e3f9ef10599041565d0 (patch) | |
| tree | a2eaf50b15cf0677534ce7fc87523e440a93b77c /Documentation/config/sequencer.txt | |
| parent | merge-ort: add a clear_internal_opts helper (diff) | |
| download | tgif-1c7873cdf4a7e84755c54e3f9ef10599041565d0.tar.xz | |
merge-ort: add a path_conflict field to merge_options_internal
This field is not yet used, but will be used by both the rename handling
code, and the conflict type handling code in process_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/sequencer.txt')
0 files changed, 0 insertions, 0 deletions