diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-27 13:02:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-27 13:02:55 -0700 |
| commit | 283cd320db9057163b2e7434ac481ff8e785671f (patch) | |
| tree | 5436f9137062cb23de48ba617572b5d06a14407e /builtin/merge-file.c | |
| parent | 553c622b685f0a7a83c77617377f08019d76c682 (diff) | |
| parent | d8279c7d85f82edea8c86e4e7c2fbd787ae09735 (diff) | |
Sync with maint
* maint:
Update mailmap to spell out "Alexander Kuleshov"
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions