development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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 committed by Jean-Noël Avila
parent 471ae3e297
commit d1e76d5ddc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
po/fr.po
View file

@ -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"