From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Feb 2007 03:09:59 +0000 (-0800)
Subject: Merge branch 'jc/merge-symlink' into maint
X-Git-Tag: v1.5.0.2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0b1f6475570b915c56f380f2bd790ff94e606ef4;p=git.git

Merge branch 'jc/merge-symlink' into maint

* jc/merge-symlink:
  merge-recursive: fix longstanding bug in merging symlinks
  merge-index: fix longstanding bug in merging symlinks
---

0b1f6475570b915c56f380f2bd790ff94e606ef4