summaryrefslogtreecommitdiffstats
path: root/range-diff.h
diff options
context:
space:
mode:
Diffstat (limited to 'range-diff.h')
-rw-r--r--range-diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/range-diff.h b/range-diff.h
index 2f69f6a434..cd85000b5a 100644
--- a/range-diff.h
+++ b/range-diff.h
@@ -16,6 +16,7 @@ struct range_diff_options {
int creation_factor;
unsigned dual_color:1;
unsigned left_only:1, right_only:1;
+ unsigned include_merges:1;
const struct diff_options *diffopt; /* may be NULL */
const struct strvec *other_arg; /* may be NULL */
};