Merge branch 'sb/t6031-typofix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2014 19:36:14 +0000 (12:36 -0700)
* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed

1  2 
t/t6031-merge-recursive.sh
Simple merge