From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 17:44:19 +0000 (-0700)
Subject: Merge branch 'jk/merge-one-file-working-tree' into maint
X-Git-Tag: v1.7.5.2~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af;p=git.git

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

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

8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af