| author | Thomas Rast <trast@student.ethz.ch> |
|---|---|
| Fri, 3 Aug 2012 12:16:25 +0000 (14:16 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 3 Aug 2012 19:13:43 +0000 (12:13 -0700) | |
| commit | f633ea2...736a2a38e92fcf61e90c8adadc5c504d |
| tree | e92dee0...f75ed994ea95322cc9dfcb75cc8c6aa0 (tree) |
| parent | d0f1ea6...03d97e63110fa7d50bb07f546a909b6e (diff) |
| merge-recursive.c | diff | blob | history |