merge: mark usage error strings for translation
The nearby error messages are already marked for translation, but these new ones aren't. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Dec 15, 2016 at 12:43 UTC
c7d227df5bf7fe9d5df98a55cd637bfaf38685ea
1 file changed
+2
-2
builtin/merge.c
+2
-2
@@ -1164,7 +1164,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1164
const char *nargv[] = {"reset", "--merge", NULL};
1165
1166
if (orig_argc != 2)
1167
- usage_msg_opt("--abort expects no arguments",
1167
+ usage_msg_opt(_("--abort expects no arguments"),
1168
builtin_merge_usage, builtin_merge_options);
1169
1170
if (!file_exists(git_path_merge_head()))
@@ -1180,7 +1180,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1180
const char *nargv[] = {"commit", NULL};
1181
1182
if (orig_argc != 2)
1183
- usage_msg_opt("--continue expects no arguments",
1183
+ usage_msg_opt(_("--continue expects no arguments"),
1184
builtin_merge_usage, builtin_merge_options);
1185
1186
if (!file_exists(git_path_merge_head()))