diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-10 12:04:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-10 12:04:23 +0900 |
| commit | b03709eae705010e5def0602a86529ce0e545f52 (patch) | |
| tree | f5ea8c7ee48eb084f2cff19656b1853aaf00a561 /builtin/merge.c | |
| parent | d6e35a2644d6c0050989061ec93ed0d9111c5ee4 (diff) | |
| parent | a30e43f61a1e614309875ab7775f2274b4e40742 (diff) | |
Merge branch 'ah/merge-usage-i18n-fix'
i18n update.
* ah/merge-usage-i18n-fix:
merge: don't translate literal commands
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 eddb8ae70d..a8a843b1f5 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -56,8 +56,8 @@ struct strategy { static const char * const builtin_merge_usage[] = { N_("git merge [<options>] [<commit>...]"), - N_("git merge --abort"), - N_("git merge --continue"), + "git merge --abort", + "git merge --continue", NULL }; |