merge-recursive: expose merge options for builtin merge
There are two very similar blocks of code that recognize options for the "recursive" merge strategy. Unify them. No functional change intended. Cc: Avery Pennarun <apenwarr@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
7610fa57e6
commit
635a7bb1d8
@ -55,6 +55,8 @@ int merge_recursive_generic(struct merge_options *o,
|
||||
void init_merge_options(struct merge_options *o);
|
||||
struct tree *write_tree_from_memory(struct merge_options *o);
|
||||
|
||||
int parse_merge_opt(struct merge_options *out, const char *s);
|
||||
|
||||
/* builtin/merge.c */
|
||||
int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
|
||||
|
||||
|
Reference in New Issue
Block a user