git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 34e557a)
merge-ort: record stage and auxiliary info for every path
authorElijah Newren <redacted>
Sun, 13 Dec 2020 08:04:16 +0000 (08:04 +0000)
committerJunio C Hamano <redacted>
Sun, 13 Dec 2020 22:18:20 +0000 (14:18 -0800)
commit98bf98416726430b6cbc8670725f008588e478a7
tree86e8c9f8a8a956c3c69f030fea6eb6e817464084tree | snapshot
parent34e557af5469299453f63d3594d5b392a09937d1commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-ort.c diff | blob | history
git clone https://git.99rst.org/PROJECT