| author | Johannes Schindelin <johannes.schindelin@gmx.de> |
|---|---|
| Tue, 26 Jul 2016 16:05:53 +0000 (18:05 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 26 Jul 2016 18:13:44 +0000 (11:13 -0700) | |
| commit | 7e97e10...3349107b9fdc388bb4aa006fae9ab560 |
| tree | 3dd84b8...34cb3b45d02051229aad776377786eb1 (tree) |
| parent | ef1177d...8e35c030c37aa533002a11d98361e6b9 (diff) |
| merge-recursive.c | diff | blob | history |