From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Dec 2013 20:59:25 +0000 (-0800)
Subject: Merge branch 'jk/two-way-merge-corner-case-fix'
X-Git-Tag: v1.9-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3979580265bac968c30ce203022d7a8294710909;p=thirdparty%2Fgit.git

Merge branch 'jk/two-way-merge-corner-case-fix'

Fix a rather longstanding corner-case bug in twoway "reset to
there" merge, which is most often seen in "git am --abort".

* jk/two-way-merge-corner-case-fix:
  t1005: add test for "read-tree --reset -u A B"
  t1005: reindent
  unpack-trees: fix "read-tree -u --reset A B" with conflicted index
---

3979580265bac968c30ce203022d7a8294710909