Skip to content

Commit d1e76d5

Browse files
alexhenriejnavila
authored andcommitted
l10n: fr: don't say that merge is "the default strategy"
The text of this message was changed in commit 71076d0 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 <[email protected]>
1 parent 471ae3e commit d1e76d5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

po/fr.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9600,7 +9600,7 @@ msgstr ""
96009600
"les réconcilier. Vous pouvez le faire en lançant une des\n"
96019601
"commandes suivantes avant votre prochain tirage :\n"
96029602
"\n"
9603-
" git config pull.rebase false # fusion (stratégie par défaut)\n"
9603+
" git config pull.rebase false # fusion\n"
96049604
" git config pull.rebase true # rebasage\n"
96059605
" git config pull.ff only # avance rapide seulement\n"
96069606
"\n"

0 commit comments

Comments
 (0)