| commit | 12ba0e771cb1af16d0ac074a6a9656cbf45494cc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Sep 2014 19:36:14 +0000 (29 12:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Sep 2014 19:36:14 +0000 (29 12:36 -0700) | ||
| tree | 7b7062c329871bf8298251c45a74dada7b8635d9 | treesnapshot (tar.gz zip) |
| parent | 4d4dc66df0da8b6c1ee7af4299ed9bcaa796f787 | commitdiff |
| parent | 8c3419bdbd5b49892c28ef32af80e0d570e5d7a5 | commitdiff |
Merge branch 'sb/t6031-typofix'
* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed
* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed
| t/t6031-merge-recursive.sh | diff1 | diff2 | blobhistory |