| author | Johannes Schindelin <johannes.schindelin@gmx.de> |
|---|---|
| Mon, 1 Aug 2016 11:44:57 +0000 (13:44 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 1 Aug 2016 18:45:30 +0000 (11:45 -0700) | |
| commit | 6999bc7...74c2a8d7605c3ad24bd4e5371a6df71c |
| tree | 5607d79...e7ea47d9ea391ed7ece69b5b022618d2 (tree) |
| parent | 548009c...d58c74dde2c51f675b369b4c50878f1b (diff) |
| merge-recursive.c | diff | blob | history |