| commit | 1c7873cdf4a7e84755c54e3f9ef10599041565d0 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 3 Dec 2020 15:59:42 +0000 (3 15:59 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Dec 2020 22:38:40 +0000 (13 14:38 -0800) | ||
| tree | a2eaf50b15cf0677534ce7fc87523e440a93b77c | treesnapshot (tar.gz zip) |
| parent | 101bc5bc2d73484d288a43fdcf1c00bc04b080e4 | commitdiff |
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |