| author | Jeff King <peff@peff.net> |
|---|---|
| Mon, 26 Oct 2015 21:36:18 +0000 (17:36 -0400) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 26 Oct 2015 21:48:54 +0000 (14:48 -0700) | |
| commit | 6f50833...98d9d88e331a0d5022130dd3d49cf876 |
| tree | f4b7b44...8073170c2846a8129baafe91b6363e39 (tree) |
| parent | 441c4a4...173fe1ee8a5c0094e587dfc47e2a6460 (diff) |
| t/t3030-merge-recursive.sh | diff | blob | history | |
| t/t6031-merge-recursive.sh | diff | blob | history |