kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jeff King 2016-12-15 12:43:46 -05:00 committed by Junio C Hamano
parent 042e290da6
commit c7d227df5b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -1164,7 +1164,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *nargv[] = {"reset", "--merge", NULL}; const char *nargv[] = {"reset", "--merge", NULL};


if (orig_argc != 2) if (orig_argc != 2)
usage_msg_opt("--abort expects no arguments", usage_msg_opt(_("--abort expects no arguments"),
builtin_merge_usage, builtin_merge_options); builtin_merge_usage, builtin_merge_options);


if (!file_exists(git_path_merge_head())) if (!file_exists(git_path_merge_head()))
@ -1180,7 +1180,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *nargv[] = {"commit", NULL}; const char *nargv[] = {"commit", NULL};


if (orig_argc != 2) if (orig_argc != 2)
usage_msg_opt("--continue expects no arguments", usage_msg_opt(_("--continue expects no arguments"),
builtin_merge_usage, builtin_merge_options); builtin_merge_usage, builtin_merge_options);


if (!file_exists(git_path_merge_head())) if (!file_exists(git_path_merge_head()))