From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2009 08:09:42 +0000 (-0800)
Subject: Merge branch 'js/maint-merge-recursive-r-d-conflict'
X-Git-Tag: v1.6.2-rc0~184
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff32340669a5521ca2b4b547b4853bfe22f60386;p=git.git

Merge branch 'js/maint-merge-recursive-r-d-conflict'

* js/maint-merge-recursive-r-d-conflict:
  merge-recursive: mark rename/delete conflict as unmerged
---

ff32340669a5521ca2b4b547b4853bfe22f60386