diff options
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 6e049b0997..7c0187d11a 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -22,6 +22,13 @@ enum unpack_trees_error_types { NB_UNPACK_TREES_ERROR_TYPES }; +/* + * Sets the list of user-friendly error messages to be used by the + * command "cmd" (either merge or checkout), and show_all_errors to 1. + */ +void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, + const char *cmd); + struct rejected_paths_list { char *path; struct rejected_paths_list *next; |