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

Merge branch 'ah/grammofix'

Browse Source 
* ah/grammofix:
  grammofix in user-facing messages
This commit is contained in:
Junio C Hamano
2014-09-19 11:38:35 -07:00
parent 4fc72d9106 ad5fe3771b
commit 296b4c4bbf
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -1143,14 +1143,14 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
*/
if (advice_resolve_conflict)
die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."));
"Please, commit your changes before you merge."));
else
die(_("You have not concluded your merge (MERGE_HEAD exists)."));
}
if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
if (advice_resolve_conflict)
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."));
"Please, commit your changes before you merge."));
else
die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
}