From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Mar 2009 04:45:14 +0000 (-0700)
Subject: Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1
X-Git-Tag: v1.6.2.1~1^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9b04430d238be1fe75ef97e3455c65ca72a7fa0;p=git.git

Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1

* jc/maint-1.6.1-add-u-remove-conflicted:
  add -u: do not fail to resolve a path as deleted
---

d9b04430d238be1fe75ef97e3455c65ca72a7fa0