From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 24 Sep 2022 13:12:37 +0000 (+0800)
Subject: Merge branch 'fr_quickfix' of github.com:jnavila/git
X-Git-Tag: v2.38.0~1^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=456a75f81445b84258ce5a6df13e4d0572a0c892;p=thirdparty%2Fgit.git

Merge branch 'fr_quickfix' of github.com:jnavila/git

* 'fr_quickfix' of github.com:jnavila/git:
  l10n: fr: don't say that merge is "the default strategy"
---

456a75f81445b84258ce5a6df13e4d0572a0c892