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>
Ævar Arnfjörð Bjarmason committed
Apr 10, 2011 at 19:34 UTC
f68f1801726eb64d139dfb7d7858a470aef595f2
1 file changed
+3
-3
builtin/merge.c
+3
-3
@@ -1043,10 +1043,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1043
}
1044
if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
1045
if (advice_resolve_conflict)
1046
- die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1047
- "Please, commit your changes before you can merge.");
1046
+ die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
1047
+ "Please, commit your changes before you can merge."));
1048
else
1049
- die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).");
1049
+ die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
1050
}
1051
resolve_undo_clear();
1052