| commit | 98bf98416726430b6cbc8670725f008588e478a7 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 13 Dec 2020 08:04:16 +0000 (13 08:04 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Dec 2020 22:18:20 +0000 (13 14:18 -0800) | ||
| tree | 86e8c9f8a8a956c3c69f030fea6eb6e817464084 | treesnapshot (tar.gz zip) |
| parent | 34e557af5469299453f63d3594d5b392a09937d1 | commitdiff |
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>
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>
| merge-ort.c | diffblobblamehistory |