diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-16 19:22:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-16 19:22:51 +0200 |
| commit | 8e0fa0e056f3ba423a711ef5ffb0dedc5917132c (patch) | |
| tree | 517d98ee7dc6a235227a7349184f4b1cacbd300f /Documentation/merge-strategies.txt | |
| parent | Sync with Git 2.22.1 (diff) | |
| parent | l10n: zh_CN: for git v2.23.0 l10n round 1~2 (diff) | |
| download | git-8e0fa0e056f3ba423a711ef5ffb0dedc5917132c.tar.xz git-8e0fa0e056f3ba423a711ef5ffb0dedc5917132c.zip | |
Merge tag 'l10n-2.23.0-rnd2' of git://github.com/git-l10n/git-po
l10n-2.23.0-rnd2
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions