From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Feb 2007 03:10:13 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~130
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5569dad48e22e7b373ce3ffcc32758163bbd7b42;p=git.git

Merge branch 'maint'

* maint:
  merge-recursive: fix longstanding bug in merging symlinks
  merge-index: fix longstanding bug in merging symlinks
---

5569dad48e22e7b373ce3ffcc32758163bbd7b42