From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Dec 2007 00:52:59 +0000 (-0800)
Subject: Merge branch 'jc/merge-recursive-gitlink'
X-Git-Tag: v1.5.4-rc0~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9cf4ec9f7ddcc589351e1ac7b0e3b88537a0b25;p=git.git

Merge branch 'jc/merge-recursive-gitlink'

* jc/merge-recursive-gitlink:
  Support a merge with conflicting gitlink change
---

d9cf4ec9f7ddcc589351e1ac7b0e3b88537a0b25