undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/error-resolve-conflict-advice'

Browse Source 
* jk/error-resolve-conflict-advice:
  error_resolve_conflict: drop quotations around operation
  error_resolve_conflict: rewrap advice message
This commit is contained in:
Junio C Hamano 2014-06-16 12:18:47 -07:00
commit d0d5ba7e6e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
advice.c
View File

@ -76,16 +76,15 @@ int git_default_advice_config(const char *var, const char *value)
int error_resolve_conflict(const char *me) int error_resolve_conflict(const char *me)
{ {
error("'%s' is not possible because you have unmerged files.", me); error("%s is not possible because you have unmerged files.", me);
if (advice_resolve_conflict) if (advice_resolve_conflict)
/* /*
* Message used both when 'git commit' fails and when * Message used both when 'git commit' fails and when
* other commands doing a merge do. * other commands doing a merge do.
*/ */
advise(_("Fix them up in the work tree,\n" advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"and then use 'git add/rm <file>' as\n" "as appropriate to mark resolution and make a commit, or use\n"
"appropriate to mark resolution and make a commit,\n" "'git commit -a'."));
"or use 'git commit -a'."));
return -1; return -1;
} }