diff options
| author | Elijah Newren <newren@gmail.com> | 2020-12-13 08:04:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:18:20 -0800 |
| commit | 98bf98416726430b6cbc8670725f008588e478a7 (patch) | |
| tree | 86e8c9f8a8a956c3c69f030fea6eb6e817464084 /t/t4013/diff.format-patch_--stdout_initial..main^ | |
| parent | 34e557af5469299453f63d3594d5b392a09937d1 (diff) | |
| download | git-98bf98416726430b6cbc8670725f008588e478a7.tar.gz git-98bf98416726430b6cbc8670725f008588e478a7.zip | |
merge-ort: record stage and auxiliary info for every path
Create a helper function, setup_path_info(), which can be used to record
all the information we want in a merged_info or conflict_info. While
there is currently only one caller of this new function, and some of its
particular parameters are fixed, future callers of this function will be
added later.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_initial..main^')
0 files changed, 0 insertions, 0 deletions