]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fac96df ff29a61)
Merge branch 'ob/rebase-conflict-advice-i18n-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Aug 2023 20:26:40 +0000 (13:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Aug 2023 20:26:40 +0000 (13:26 -0700)
i18n coverage improvement and avoidance of sentence lego.

* ob/rebase-conflict-advice-i18n-fix:
  advice: handle "rebase" in error_resolve_conflict()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.