diff options
Diffstat (limited to 'apply.h')
| -rw-r--r-- | apply.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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; |
