From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Sep 2014 19:36:14 +0000 (-0700)
Subject: Merge branch 'sb/t6031-typofix'
X-Git-Tag: v2.2.0-rc0~73
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12ba0e771cb1af16d0ac074a6a9656cbf45494cc

Merge branch 'sb/t6031-typofix'

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

12ba0e771cb1af16d0ac074a6a9656cbf45494cc