diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 11:38:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 11:38:35 -0700 |
| commit | 296b4c4bbf63c8addb1654a05950843e9984d0eb (patch) | |
| tree | 2a93522efd6d616bc60372d945c3b43d1f2fb54f /builtin/merge.c | |
| parent | 4fc72d91066d8fcb6de25596429fd603d3d91d79 (diff) | |
| parent | ad5fe3771b50f3862130d150b5cc8bb316ef6f1c (diff) | |
| download | git-296b4c4bbf63c8addb1654a05950843e9984d0eb.tar.gz git-296b4c4bbf63c8addb1654a05950843e9984d0eb.tar.xz | |
Merge branch 'ah/grammofix'
* ah/grammofix:
grammofix in user-facing messages
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 9da9e30d9..ec6fa9398 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -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).")); } |