diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-03-14 17:05:05 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-14 10:08:52 -0700 |
| commit | 135cc712c39fa7ccf25b9b2b55d1d07fc85c85a4 (patch) | |
| tree | 5a70d7731d848657bf9f8e0cc133effd0f14b297 /merge-recursive.h | |
| parent | 412aff7b3379b182e3331ec66c0657ae4e39d576 (diff) | |
| download | git-135cc712c39fa7ccf25b9b2b55d1d07fc85c85a4.tar.gz | |
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 1 |
1 files changed, 1 insertions, 0 deletions
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, |