summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2020-07-13 08:39:23 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2020-07-13 08:39:23 +0800
commita4ef0982a00ca98d2ddd11d374f197f5aa948ada (patch)
treeb49e32f2ff81c8ebd2dae79a058ad7eddc2edb79 /builtin/merge-tree.c
parentMerge branch 'master' of github.com:nafmo/git-l10n-sv (diff)
parentl10n: fr v2.28.0 round 1 (diff)
downloadtgif-a4ef0982a00ca98d2ddd11d374f197f5aa948ada.tar.xz
Merge branch 'fr_v2.28.0_rnd1' of github.com:jnavila/git
* 'fr_v2.28.0_rnd1' of github.com:jnavila/git: l10n: fr v2.28.0 round 1
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions