diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:11:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:11:40 +0900 |
| commit | 14c63a9dc093d6738454f6369a4f5663ca732cf7 (patch) | |
| tree | 285523c98a6e9ec57cd401717627bec71a354147 /merge-recursive.c | |
| parent | RelNotes: the fifth batch for 2.16 (diff) | |
| parent | Almost ready for 2.15.1 (diff) | |
| download | tgif-14c63a9dc093d6738454f6369a4f5663ca732cf7.tar.xz | |
Sync with maint
* maint:
Almost ready for 2.15.1
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions