Merge branch 'ah/grammofix'

* ah/grammofix: grammofix in user-facing messages
2014-09-19 11:38:35 -07:00
parent 4fc72d9106 ad5fe3771b
commit 296b4c4bbf
8 changed files with 10 additions and 10 deletions
--- a/builtin/commit.c
+++ b/builtin/commit.c
@ -1826,7 +1826,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)

 	if (commit_index_files())
 		die (_("Repository has been updated, but unable to write\n"
-		     "new_index file. Check that disk is not full or quota is\n"
+		     "new_index file. Check that disk is not full and quota is\n"
 		     "not exceeded, and then \"git reset HEAD\" to recover."));

 	rerere(0);