diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2021-03-05 13:47:07 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2021-03-05 13:47:07 +0800 |
| commit | 1ecef023a9b89056d7070662dd0541481b54a7dc (patch) | |
| tree | 9643c8f35e9674025409d2e2684d87e4f38d5676 /builtin/merge-ours.c | |
| parent | Merge branch 'master' of github.com:nafmo/git-l10n-sv (diff) | |
| parent | l10n: fr: v2.31 rnd 2 (diff) | |
| download | tgif-1ecef023a9b89056d7070662dd0541481b54a7dc.tar.xz | |
Merge branch 'fr_next' of github.com:jnavila/git
* 'fr_next' of github.com:jnavila/git:
l10n: fr: v2.31 rnd 2
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions