From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jan 2009 09:15:19 +0000 (-0800)
Subject: Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
X-Git-Tag: v1.6.1.1~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=94468bc1f719b7e0009ec0600b178dd5f412d702;p=git.git

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

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

94468bc1f719b7e0009ec0600b178dd5f412d702