[PATCH 3/7] merge-ort: add a path_conflict field to merge_options_internal

From

Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>

Date

Dec 3, 2020, 15:59 UTC

Message-ID

<fa0881892de9f0089e2ee79f616fbd8fc5a95467.1607011187.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.803.git.1607011187.gitgitgadget@gmail.com>

From: Elijah Newren <newren@gmail.com>

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 merge-ort.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/merge-ort.c b/merge-ort.c
index 0654c76c8c..bcd53d3799 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -148,6 +148,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, see tree-walk.h's struct traverse_info,
 	 * particularly the documentation above the "fn" member.  Note that

-- 
gitgitgadget