| author | Jeff King <peff@peff.net> |
|---|---|
| Thu, 24 Sep 2015 21:07:43 +0000 (17:07 -0400) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 5 Oct 2015 18:08:04 +0000 (11:08 -0700) | |
| commit | b4600fb...071898068ef30be2766ee75880ec308b |
| tree | ee50a70...3f17743800de7bd4726cb917029a01fb (tree) |
| parent | bd22d4f...bc10052fef1a6c52aec066ee64236340 (diff) |
| merge-recursive.c | diff | blob | history |