git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 101bc5b)
merge-ort: add a path_conflict field to merge_options_internal
authorElijah Newren <redacted>
Thu, 3 Dec 2020 15:59:42 +0000 (15:59 +0000)
committerJunio C Hamano <redacted>
Sun, 13 Dec 2020 22:38:40 +0000 (14:38 -0800)
commit1c7873cdf4a7e84755c54e3f9ef10599041565d0
treea2eaf50b15cf0677534ce7fc87523e440a93b77ctree | snapshot
parent101bc5bc2d73484d288a43fdcf1c00bc04b080e4commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-ort.c diff | blob | history
git clone https://git.99rst.org/PROJECT