| commit | 456a75f81445b84258ce5a6df13e4d0572a0c892 | |
| author | Jiang Xin <worldhello.net@gmail.com> | |
| Sat, 24 Sep 2022 13:12:37 +0000 (24 21:12 +0800) | ||
| committer | Jiang Xin <worldhello.net@gmail.com> | |
| Sat, 24 Sep 2022 13:12:37 +0000 (24 21:12 +0800) | ||
| tree | cf522005a4734b6a92df68ed9897cd4a0b05b197 | treesnapshot (tar.gz zip) |
| parent | 9865dce5578a3c900e3558c8ec0cdf4ba2647797 | commitdiff |
| parent | d1e76d5ddcacdfc76bc247e7594e3fbaaa5ea9cc | commitdiff |
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"
* 'fr_quickfix' of github.com:jnavila/git:
l10n: fr: don't say that merge is "the default strategy"