diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:32:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:32:17 (GMT) |
| commit | 4766036ecdee2d45b5a955409da5e6751c3e2f05 (patch) | |
| tree | 7adcc5c39b32dc7e0cd850bcfad22e0bae7064c6 /sha1_file.c | |
| parent | 66c24cd8a4b8db93b5fee81f144d6411ac7e5391 (diff) | |
| parent | 77b43cac9feac1079f3643988cfadee63e4365f7 (diff) | |
| download | git-4766036ecdee2d45b5a955409da5e6751c3e2f05.zip git-4766036ecdee2d45b5a955409da5e6751c3e2f05.tar.gz git-4766036ecdee2d45b5a955409da5e6751c3e2f05.tar.bz2 | |
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 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions