projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation/diff-config: work around AsciiDoc misfortune
[git.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index 58f3435e9e854ab82c2fd0c10c55520bc69e5ed0..9e090a347016ea715acf8d26ec5527f033b94ba1 100644
(file)
--- 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);
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
#endif