diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:26:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:26:46 -0700 |
| commit | 2eb54692d145a0c2939698302e913975f059ac34 (patch) | |
| tree | 88911c7cd362f52770bded7c03b73f32a7d8abb7 /merge-recursive.h | |
| parent | Merge branch 'po/userdiff-csharp' (diff) | |
| parent | t7609: test merge and checkout error messages (diff) | |
| download | tgif-2eb54692d145a0c2939698302e913975f059ac34.tar.xz | |
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages:
t7609: test merge and checkout error messages
unpack_trees: group error messages by type
merge-recursive: distinguish "removed" and "overwritten" messages
merge-recursive: porcelain messages for checkout
Turn unpack_trees_options.msgs into an array + enum
Conflicts:
t/t3400-rebase.sh
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index b831293b38..08f9850367 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -23,8 +23,11 @@ struct merge_options { struct string_list current_directory_set; }; -/* Return a list of user-friendly error messages to be used by merge */ -struct unpack_trees_error_msgs get_porcelain_error_msgs(void); +/* + * 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, |