diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2022-06-26 22:17:24 -0600 |
|---|---|---|
| committer | Jean-Noël Avila <jn.avila@free.fr> | 2022-09-23 20:42:58 +0200 |
| commit | d1e76d5ddcacdfc76bc247e7594e3fbaaa5ea9cc (patch) | |
| tree | 21539e594dd2889ccbe0039bae61f67f95d71515 | |
| parent | 471ae3e2977a938d61eac3cca76d1a5f321b4253 (diff) | |
l10n: fr: don't say that merge is "the default strategy"
The text of this message was changed in commit
71076d0edde43a7672a9a0f555753ff078602a64 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>
| -rw-r--r-- | po/fr.po | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |