diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-04-10 19:34:05 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:12:53 -0700 |
| commit | f68f1801726eb64d139dfb7d7858a470aef595f2 (patch) | |
| tree | 142c850f18a03446457e4ac3e040e3043fe36e31 /builtin | |
| parent | c7f426d4bc38982fe4e64bf3ed4673ddb03c3374 (diff) | |
| download | git-f68f1801726eb64d139dfb7d7858a470aef595f2.tar.gz git-f68f1801726eb64d139dfb7d7858a470aef595f2.tar.xz | |
i18n: mark merge CHERRY_PICK_HEAD messages for translation
Mark CHERRY_PICK_HEAD related messages in builtin/merge.c that were
added in v1.7.5-rc0~88^2~2 (Introduce CHERRY_PICK_HEAD) by Jay Soffian
for translation.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 6e63c0839..08245b6d6 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1043,10 +1043,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } 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."); + die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" + "Please, commit your changes before you can merge.")); else - die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."); + die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).")); } resolve_undo_clear(); |