From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:54:08 +0000 (-0700)
Subject: Merge branch 'jk/merge-one-file-working-tree'
X-Git-Tag: v1.7.6-rc0~96
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac13e7c514d6790cc59041545f26b3f5da543b25;p=git.git

Merge branch 'jk/merge-one-file-working-tree'

* jk/merge-one-file-working-tree:
  merge-one-file: fix broken merges with alternate work trees
  add tests for merge-index / merge-one-file
---

ac13e7c514d6790cc59041545f26b3f5da543b25