From 135cc712c39fa7ccf25b9b2b55d1d07fc85c85a4 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Thu, 14 Mar 2024 17:05:05 +0000 Subject: merge options: add a conflict style member Add a conflict_style member to `struct merge_options` and `struct ll_merge_options` to allow callers to override the default conflict style. This will be used in the next commit. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- merge-recursive.h | 1 + 1 file changed, 1 insertion(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index 3d3b3e3c29..e67d38c303 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -31,6 +31,7 @@ struct merge_options { /* xdiff-related options (patience, ignore whitespace, ours/theirs) */ long xdl_opts; + int conflict_style; enum { MERGE_VARIANT_NORMAL = 0, MERGE_VARIANT_OURS, -- cgit v1.2.3