admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge options: add a conflict style member

Browse Source 
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>
This commit is contained in:
Phillip Wood
2024-03-14 17:05:05 +00:00
committed by Junio C Hamano
parent 412aff7b33
commit 135cc712c3
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
merge-ll.h
View File

@@ -78,11 +78,14 @@ struct ll_merge_options {
*/
unsigned extra_marker_size;
/* Override the global conflict style. */
int conflict_style;
/* Extra xpparam_t flags as defined in xdiff/xdiff.h. */
long xdl_opts;
};
#define LL_MERGE_OPTIONS_INIT {0}
#define LL_MERGE_OPTIONS_INIT { .conflict_style = -1 }
enum ll_merge_result {
LL_MERGE_ERROR = -1,