diff options
| author |  Alex Henrie <alexhenrie24@gmail.com> | 2021-05-15 14:01:11 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-16 13:00:28 +0900 |
| commit | a30e43f61a1e614309875ab7775f2274b4e40742 (patch) | |
| tree | b11541f27e714381193cf621bf44e804fa57236b /builtin | |
| parent | Git 2.31.1 (diff) | |
| download | tgif-a30e43f61a1e614309875ab7775f2274b4e40742.tar.xz | |
merge: don't translate literal commands
These strings have not been modified in any translation, nor should they
be.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -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 388619536a..2d3424cecc 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 }; |