diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:32:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:32:17 -0800 |
| commit | 4766036ecdee2d45b5a955409da5e6751c3e2f05 (patch) | |
| tree | 7adcc5c39b32dc7e0cd850bcfad22e0bae7064c6 /t/t3506-cherry-pick-ff.sh | |
| parent | Merge branch 'sb/sha1-loose-object-info-check-existence' into maint (diff) | |
| parent | t1005: add test for "read-tree --reset -u A B" (diff) | |
| download | tgif-4766036ecdee2d45b5a955409da5e6751c3e2f05.tar.xz | |
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
Diffstat (limited to 't/t3506-cherry-pick-ff.sh')
0 files changed, 0 insertions, 0 deletions