aboutsummaryrefslogtreecommitdiffstats
path: root/apply.h
diff options
context:
space:
mode:
Diffstat (limited to 'apply.h')
-rw-r--r--apply.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/apply.h b/apply.h
index cd25d24cc4..90e887ec0e 100644
--- a/apply.h
+++ b/apply.h
@@ -59,6 +59,7 @@ struct apply_state {
struct repository *repo;
const char *index_file;
enum apply_verbosity apply_verbosity;
+ int merge_variant;
char *fake_ancestor;
const char *patch_input_file;
int line_termination;