From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Dec 2013 19:32:04 +0000 (-0800)
Subject: Merge branch 'jk/two-way-merge-corner-case-fix' into maint
X-Git-Tag: v1.8.5.2~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4766036ecdee2d45b5a955409da5e6751c3e2f05

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

"git am --abort" sometimes complained about not being able to write
a tree with an 0{40} object in it.

* 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
---

4766036ecdee2d45b5a955409da5e6751c3e2f05