diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:29 -0700 |
| commit | 231cc9489915b1e09c44350a0a7e58fb73ffdf34 (patch) | |
| tree | 59a3144ea5fb362fadc9f10272505dcaeb7f4853 /merge-recursive.c | |
| parent | Merge branch 'ls/p4-lfs' (diff) | |
| parent | .mailmap: update to my shorter email address (diff) | |
| download | tgif-231cc9489915b1e09c44350a0a7e58fb73ffdf34.tar.xz | |
Merge branch 'ew/normal-to-e'
* ew/normal-to-e:
.mailmap: update to my shorter email address
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions