merge-recursive: Fix typo
authorElijah Newren <newren@gmail.com>
Tue, 17 Aug 2010 23:52:27 +0000 (17:52 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 18:55:38 +0000 (11:55 -0700)
commita3e4136...5478585206966bdbb7fd7bf24b9d1ea7
treebc9ae62...4aa95803a218a64d6aa4d6ebef58e456copy hash to clipboard (tree)
parentdd56858...8bca9b0cadc61a87c6470fa7df227302copy hash to clipboard (diff)
merge-recursive.c