diff options
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index d62bba9baa..fad680dced 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -26,7 +26,8 @@ enum unpack_trees_error_types { * Sets the list of user-friendly error messages to be used by the * command "cmd" (either merge or checkout) */ -void setup_unpack_trees_porcelain(const char **msgs, const char *cmd); +void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, + const char *cmd); struct rejected_paths_list { char *path; |