i pushed the branches necessary to reproduce this right before it happened, so you should be able to pull them and try it yourself. thanks, -Len [lenb@t61 acpi (test)]$ git push lenb lenb@xxxxxxxxxxxxxxxxx's password: Counting objects: 723, done. Compressing objects: 100% (237/237), done. Writing objects: 100% (492/492), 82.22 KiB, done. Total 492 (delta 389), reused 337 (delta 249) To master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git 93d7446..dba92d3 linus -> linus 93d7446..dba92d3 release -> release 93d7446..c68a500 suspend -> suspend 93d7446..5dceb6d test -> test [lenb@t61 acpi (test)]$ git merge test suspend Already up-to-date with 5dceb6d3377c3cbd06f7b3282fec0e201273c302 Trying simple merge with c68a5009ab9938af22af668e0e2d646d2482c866 /home/lenb/bin/git-merge-octopus: line 52: 24287 Segmentation fault git read-tree -u -m --aggressive $common $MRT $SHA1 Merge with strategy octopus failed. [lenb@t61 acpi (test)]$ git merge test suspend fatal: unable to create '.git/index.lock': File exists Already up-to-date with 5dceb6d3377c3cbd06f7b3282fec0e201273c302 Trying simple merge with c68a5009ab9938af22af668e0e2d646d2482c866 fatal: unable to create '.git/index.lock': File exists Merge with strategy octopus failed. [lenb@t61 acpi (test)]$ git --version git version 1.5.4.4.537.gb75aa [lenb@t61 acpi (test)]$ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
