| author | Leif Middelschulte <Leif.Middelschulte@gmail.com> |
|---|---|
| Mon, 11 Jun 2018 17:31:28 +0000 (19:31 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 11 Jun 2018 18:03:55 +0000 (11:03 -0700) | |
| commit | 40aac22...43c8f9c4cc3acf625fdec3a24368ed4c |
| tree | a030bbc...1514b0a67ebffb302bf1c4f7de345e06 (tree) |
| parent | 76f4212...9718f5f504558e97dfb99e16c9ceb7c6 (diff) |
| merge-recursive.c | diff | blob | history |