merge-recursive: Fix typo
commita3e413675478585206966bdbb7fd7bf24b9d1ea7
authorElijah Newren <newren@gmail.com>
Tue, 17 Aug 2010 23:52:27 +0000 (17 17:52 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 18:55:38 +0000 (18 11:55 -0700)
treebc9ae6254aa95803a218a64d6aa4d6ebef58e456
parentdd5685818bca9b0cadc61a87c6470fa7df227302
merge-recursive: Fix typo

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c