| author | Stefan Beller <stefanbeller@gmail.com> |
|---|---|
| Sun, 21 Sep 2014 20:49:46 +0000 (22:49 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 23 Sep 2014 18:29:20 +0000 (11:29 -0700) | |
| commit | 422af49...2fe707c5e7bff1e4a8250232401154b0 |
| tree | 9324c7b...97de39a639193145d21ec2a6b51b1c9c (tree) |
| parent | 331a183...b26c3032bec27b66307a9de9b3b11509 (diff) |
| merge-recursive.c | diff | blob | history |