l10n: fr: don't say that merge is "the default strategy"

The text of this message was changed in commit
71076d0edd to avoid making any
suggestion about which strategy is better for the situation at hand.
Update the Franch translation to match.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
This commit is contained in:
Alex Henrie 2022-06-26 22:17:24 -06:00 коммит произвёл Jean-Noël Avila
Родитель 471ae3e297
Коммит d1e76d5ddc
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -9600,7 +9600,7 @@ msgstr ""
"les réconcilier. Vous pouvez le faire en lançant une des\n"
"commandes suivantes avant votre prochain tirage :\n"
"\n"
" git config pull.rebase false # fusion (stratégie par défaut)\n"
" git config pull.rebase false # fusion\n"
" git config pull.rebase true # rebasage\n"
" git config pull.ff only # avance rapide seulement\n"
"\n"