diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-26 09:47:58 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-26 20:05:02 +0400 |
| commit | 635a7bb1d807390bedfc1147d2052e8423bcd1e0 (patch) | |
| tree | 317b28d6a3d042cb3a5e728f62751e905b076535 /merge-recursive.h | |
| parent | 7610fa57e63b0acc0a66717fc2d85755634db591 (diff) | |
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>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index c5fbe796bb..37ff99a298 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -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); |