From: Junio C Hamano <junkio@cox.net>
Date: Tue, 17 Apr 2007 23:55:46 +0000 (-0700)
Subject: Merge branch 'jc/read-tree-df'
X-Git-Tag: v1.5.2-rc0~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=35812d830579643f898979be479b6fee5f7c7b38;p=git.git

Merge branch 'jc/read-tree-df'

* jc/read-tree-df:
  t3030: merge-recursive backend test.
  merge-recursive: handle D/F conflict case more carefully.
  merge-recursive: do not barf on "to be removed" entries.
  Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
  t1000: fix case table.
---

35812d830579643f898979be479b6fee5f7c7b38