diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2022-09-24 16:12:37 +0300 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-09-24 16:12:37 +0300 |
| commit | 456a75f81445b84258ce5a6df13e4d0572a0c892 (patch) | |
| tree | cf522005a4734b6a92df68ed9897cd4a0b05b197 /po | |
| parent | 9865dce5578a3c900e3558c8ec0cdf4ba2647797 (diff) | |
| parent | d1e76d5ddcacdfc76bc247e7594e3fbaaa5ea9cc (diff) | |
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"
Diffstat (limited to 'po')
| -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" |