diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index 196f05310..34492dbd6 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -24,12 +24,6 @@ struct merge_options { struct string_list current_directory_set; }; -/* - * Sets the list of user-friendly error messages to be used by the - * command "cmd" (either merge or checkout) - */ -void set_porcelain_error_msgs(const char **msgs, const char *cmd); - /* merge_trees() but with recursive ancestor consolidation */ int merge_recursive(struct merge_options *o, struct commit *h1, |