Christian Couder wrote: > --- a/advice.c > +++ b/advice.c > @@ -34,6 +34,13 @@ int git_default_advice_config(const char *var, const char *value) > return 0; > } > > +const char unmerged_file_advice[] = > + "'%s' is not possible because you have unmerged files.\n" > + "Please, fix them up in the work tree, and then use 'git add/rm <file>' as\n" > + "appropriate to mark resolution and make a commit, or use 'git commit -a'."; > +const char unmerged_file_no_advice[] = > + "'%s' is not possible because you have unmerged files."; static? > --- a/advice.h > +++ b/advice.h > @@ -13,5 +13,6 @@ extern int advice_detached_head; > int git_default_advice_config(const char *var, const char *value); > > extern void NORETURN die_resolve_conflict(const char *me); > +extern int error_resolve_conflict(const char *me); I like it. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html