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"

Jiang Xin committed Sep 24, 2022 at 21:12 UTC 456a75f81445b84258ce5a6df13e4d0572a0c892

No changes.