| author | René Scharfe <l.s.r@web.de> |
|---|---|
| Fri, 5 Aug 2016 20:42:12 +0000 (22:42 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 5 Aug 2016 22:10:35 +0000 (15:10 -0700) | |
| commit | af4941d...44f8bbbc02f68472f4cd6d5846ee043c |
| tree | 3079f5d...07915054516d0d60b4592a9576e8fe43 (tree) |
| parent | 08df31e...ccfe1576971ea4ba42570a424c3cfc41 (diff) |
| merge-recursive.c | diff | blob | history |