aboutsummaryrefslogtreecommitdiffstats
path: root/commit.c
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2022-09-24 21:12:37 +0800
committerJiang Xin <worldhello.net@gmail.com>2022-09-24 21:12:37 +0800
commit456a75f81445b84258ce5a6df13e4d0572a0c892 (patch)
treecf522005a4734b6a92df68ed9897cd4a0b05b197 /commit.c
parentMerge branch 'po-id' of github.com:bagasme/git-po (diff)
parentl10n: fr: don't say that merge is "the default strategy" (diff)
downloadgit-456a75f81445b84258ce5a6df13e4d0572a0c892.tar.gz
git-456a75f81445b84258ce5a6df13e4d0572a0c892.zip
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 'commit.c')
0 files changed, 0 insertions, 0 deletions