diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-01 13:21:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-01 13:21:33 -0700 |
| commit | ccdc7d98bb39aad1dc1bc78357a763d10fe14ddb (patch) | |
| tree | 34fde699f6ff8d34ee660fc616eade80242baa4f /merge-recursive.h | |
| parent | The twelfth batch (diff) | |
| parent | checkout: fix interaction between --conflict and --merge (diff) | |
| download | git-ccdc7d98bb39aad1dc1bc78357a763d10fe14ddb.tar.gz git-ccdc7d98bb39aad1dc1bc78357a763d10fe14ddb.zip | |
Merge branch 'pw/checkout-conflict-errorfix'
"git checkout --conflict=bad" reported a bad conflictStyle as if it
were given to a configuration variable; it has been corrected to
report that the command line option is bad.
* pw/checkout-conflict-errorfix:
checkout: fix interaction between --conflict and --merge
checkout: cleanup --conflict=<style> parsing
merge options: add a conflict style member
merge-ll: introduce LL_MERGE_OPTIONS_INIT
xdiff-interface: refactor parsing of merge.conflictstyle
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, |