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>
Elijah Newren committed
Dec 3, 2020 at 15:59 UTC
1c7873cdf4a7e84755c54e3f9ef10599041565d0
1 file changed
+7
merge-ort.c
+7
index ced6be1f9f..d88307489b 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -165,6 +165,13 @@ struct conflict_info {
/* Whether this path is/was involved in a directory/file conflict */
unsigned df_conflict:1;
+ /*
+ * Whether this path is/was involved in a non-content conflict other
+ * than a directory/file conflict (e.g. rename/rename, rename/delete,
+ * file location based on possible directory rename).
+ */
+ unsigned path_conflict:1;
+
/*
* For filemask and dirmask, the ith bit corresponds to whether the
* ith entry is a file (filemask) or a directory (dirmask). Thus,