undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ah/merge-usage-i18n-fix'

Browse Source 
i18n update.

* ah/merge-usage-i18n-fix:
  merge: don't translate literal commands
This commit is contained in:
Junio C Hamano 2021-06-10 12:04:23 +09:00
commit b03709eae7
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

@ -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
};