diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-12-03 15:59:43 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:38:47 -0800 |
| commit | 43c1dccb91c0d56b0b00f1b452a1a7204c4242da (patch) | |
| tree | d4a9d8bd522590c38b932a9b7fd7073e28aa01b1 /Documentation/doc-diff | |
| parent | merge-ort: add a path_conflict field to merge_options_internal (diff) | |
| download | tgif-43c1dccb91c0d56b0b00f1b452a1a7204c4242da.tar.xz | |
merge-ort: add a paths_to_free field to merge_options_internal
This field will be used in future patches to allow removal of paths from
opt->priv->paths.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/doc-diff')
0 files changed, 0 insertions, 0 deletions