diff options
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, |