diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index b88000e3c2..3d3b3e3c29 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -55,6 +55,9 @@ struct merge_options { void init_merge_options(struct merge_options *opt, struct repository *repo); +void copy_merge_options(struct merge_options *dst, struct merge_options *src); +void clear_merge_options(struct merge_options *opt); + /* parse the option in s and update the relevant field of opt */ int parse_merge_opt(struct merge_options *opt, const char *s); |