]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6e35a2 a30e43f)
Merge branch 'ah/merge-usage-i18n-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jun 2021 03:04:23 +0000 (12:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jun 2021 03:04:23 +0000 (12:04 +0900)
i18n update.

* ah/merge-usage-i18n-fix:
  merge: don't translate literal commands

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.