| commit | 3979580265bac968c30ce203022d7a8294710909 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Dec 2013 20:59:25 +0000 (5 12:59 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Dec 2013 20:59:25 +0000 (5 12:59 -0800) | ||
| tree | 46597ff73917d723a1a285166042da516e5ce861 | treesnapshot (tar.gz zip) |
| parent | 10167eb251e177349eebf24650d3c0cc26bd0d75 | commitdiff |
| parent | 77b43cac9feac1079f3643988cfadee63e4365f7 | commitdiff |
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
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
| unpack-trees.c | diff1 | diff2 | blobhistory |