From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Feb 2009 08:26:17 +0000 (-0800)
Subject: Merge branch 'jc/maint-add-u-remove-conflicted'
X-Git-Tag: v1.6.2-rc0~36
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f39e4cfa2ec2bab4175cee3a9e806d8b65161c75;p=git.git

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

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

f39e4cfa2ec2bab4175cee3a9e806d8b65161c75