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>

diff --git a/merge-ort.c b/merge-ort.c
index ced6be1f9f60194ee15a2dbcfb39dfcf7177aa7d..d88307489be1cd2c9c4a39e94e29d67379458330 100644 (file)
--- 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,