mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dg/local-mod-error-messages'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-09-03 22:23:49 -07:00
parent f92d62ec4e c5978a507c
commit c208e05bd9
7 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.h
View File

@ -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,