From: Junio C Hamano <junkio@cox.net>
Date: Sun, 8 Apr 2007 06:52:40 +0000 (-0700)
Subject: Merge branch 'jc/read-tree-df' (early part)
X-Git-Tag: v1.5.2-rc0~73
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=640ee0d1cd771bf6093602f1beb143d356607446;p=git-core%2Fgit.git

Merge branch 'jc/read-tree-df' (early part)

* 'jc/read-tree-df' (early part):
  Fix switching to a branch with D/F when current branch has file D.
  Fix twoway_merge that passed d/f conflict marker to merged_entry().
  Fix read-tree --prefix=dir/.
  unpack-trees: get rid of *indpos parameter.
  unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
  add_cache_entry(): removal of file foo does not conflict with foo/bar
---

640ee0d1cd771bf6093602f1beb143d356607446