diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 15:08:10 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 15:08:10 +0100 |
| commit | 43efcf42382e87de4aa423e5e1607958ad1717d0 (patch) | |
| tree | 7e19a0765b0dd6885fbdf69d3a8d0159a1b42de8 /merge-recursive.h | |
| parent | 45d74c4b0fe38218b4569a90da7102cf48d616c2 (diff) | |
| parent | c7fd06b6411fb04eb4d9acd7f8822a288a50dc17 (diff) | |
| download | git-43efcf42382e87de4aa423e5e1607958ad1717d0.tar.gz | |
Merge branch 'baserock/jonathanmaw/S9007/upgrade-git' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Reviewed-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index 58f3435e9e..9e090a3470 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -59,9 +59,4 @@ 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, size_t xopts_nr, - const char **xopts, struct commit_list *common, - const char *head_arg, struct commit_list *remotes); - #endif |