| author | Johannes Schindelin <johannes.schindelin@gmx.de> |
|---|---|
| Tue, 26 Jul 2016 16:06:26 +0000 (18:06 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 26 Jul 2016 18:13:44 +0000 (11:13 -0700) | |
| commit | 6003303...1e5086a9f28f18469a8a72ad22f75c86 |
| tree | 3d99825...1f28b95c13a7ed79021d24e4a81bdf22 (tree) |
| parent | 75456f9...d4bd201f815484e9d2ff2ae429305ab5 (diff) |
| merge-recursive.c | diff | blob | history |