Merge branch 'sb/t6031-typofix'

* sb/t6031-typofix: t6031-test-merge-recursive: do not forget to add file to be committed

Junio C Hamano committed Sep 29, 2014 at 12:36 UTC 12ba0e771cb1af16d0ac074a6a9656cbf45494cc

No changes.