diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2014-08-30 13:56:01 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-02 12:00:30 -0700 |
| commit | ad5fe3771b50f3862130d150b5cc8bb316ef6f1c (patch) | |
| tree | 720d0806aa46914127296596ea5818f283dc502f /builtin/merge.c | |
| parent | 96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff) | |
| download | git-ad5fe3771b50f3862130d150b5cc8bb316ef6f1c.tar.gz | |
grammofix in user-facing messagesah/grammofix
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ce82eb297d..db47200d81 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1144,14 +1144,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).")); } |