diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
| commit | c208e05bd9880028c980fafbc5dda3d17a603ac1 (patch) | |
| tree | 25d587aacf885345b2b001bc006ac3871b5c7a4b /merge-recursive.h | |
| parent | f92d62ec4ead67109418483b65aaf158b7462121 (diff) | |
| parent | c5978a507ca20b12008724f78237784193fb9489 (diff) | |
| download | git-c208e05bd9880028c980fafbc5dda3d17a603ac1.tar.gz | |
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages:
t7609-merge-co-error-msgs: test non-fast forward case too.
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
setup_unpack_trees_porcelain: take the whole options struct as parameter
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Conflicts:
merge-recursive.c
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 196f053106..34492dbd6e 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, |