| commit | 4766036ecdee2d45b5a955409da5e6751c3e2f05 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Dec 2013 19:32:04 +0000 (17 11:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Dec 2013 19:32:17 +0000 (17 11:32 -0800) | ||
| tree | 7adcc5c39b32dc7e0cd850bcfad22e0bae7064c6 | treesnapshot (tar.gz zip) |
| parent | 66c24cd8a4b8db93b5fee81f144d6411ac7e5391 | commitdiff |
| parent | 77b43cac9feac1079f3643988cfadee63e4365f7 | commitdiff |
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
"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
| unpack-trees.c | diff1 | diff2 | blobhistory |