From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Jun 2006 07:10:48 +0000 (-0700)
Subject: Fix earlier mismerges.
X-Git-Tag: v1.4.1-rc1~38
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b266b123cd3124497a1d006cb126033ce458a85c?hp=b266b123cd3124497a1d006cb126033ce458a85c

Fix earlier mismerges.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---