diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:55 +0900 |
| commit | 5d90463e8cb03e4d13cb6605b7c971c652c287ee (patch) | |
| tree | b9fba5ffed56da97f287e46901cfe3f946f44a6b /mergetools/p4merge | |
| parent | Merge branch 'js/rebase-autostash-detach-fix' (diff) | |
| parent | Update .mailmap (diff) | |
| download | tgif-5d90463e8cb03e4d13cb6605b7c971c652c287ee.tar.xz | |
Merge branch 'js/mailmap'
Update the mailmap to unify multiple entries for the authors with
commits since v2.10.
* js/mailmap:
Update .mailmap
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions