From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Apr 2013 21:33:14 +0000 (-0700)
Subject: Merge branch 'jk/rm-removed-paths'
X-Git-Tag: v1.8.3-rc0~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f3d66c6dc0c6915888fbf928de0ae22739abc70;p=thirdparty%2Fgit.git

Merge branch 'jk/rm-removed-paths'

A handful of test cases and a corner case bugfix for "git rm".

* jk/rm-removed-paths:
  t3600: document failure of rm across symbolic links
  t3600: test behavior of reverse-d/f conflict
  rm: do not complain about d/f conflicts during deletion
---

0f3d66c6dc0c6915888fbf928de0ae22739abc70