| author | Stefan Beller <stefanbeller@gmail.com> |
|---|---|
| Tue, 23 Sep 2014 14:55:50 +0000 (16:55 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 23 Sep 2014 18:31:41 +0000 (11:31 -0700) | |
| commit | 040b2ac...78366215bfc27be5e110a2f0170e6864 |
| tree | 0a8a01c...fc10d7a170f01ece081c1536316b30a6 (tree) |
| parent | 422af49...2fe707c5e7bff1e4a8250232401154b0 (diff) |
| merge-recursive.c | diff | blob | history |