summaryrefslogtreecommitdiff
path: root/t/t5004/empty.zip
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-12-05 12:59:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-05 12:59:25 -0800
commit3979580265bac968c30ce203022d7a8294710909 (patch)
tree46597ff73917d723a1a285166042da516e5ce861 /t/t5004/empty.zip
parentMerge branch 'jc/ref-excludes' (diff)
parentt1005: add test for "read-tree --reset -u A B" (diff)
downloadtgif-3979580265bac968c30ce203022d7a8294710909.tar.xz
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
Diffstat (limited to 't/t5004/empty.zip')
0 files changed, 0 insertions, 0 deletions