| author | Andrey Okoshkin <a.okoshkin@samsung.com> |
|---|---|
| Tue, 31 Oct 2017 09:09:13 +0000 (12:09 +0300) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 1 Nov 2017 01:11:56 +0000 (10:11 +0900) | |
| commit | 8048622...9bcbc29f2e7850ecf29f17c1c1aaae6e |
| tree | 45d4148...8a79bdaf458779035feb8ae1a934b2f2 (tree) |
| parent | 42e6fde...c28150206956ea4be490d886c4ecbd68 (diff) |
| merge-recursive.c | diff | blob | history |