I haven't tried this on newer versions of git, but the release notes for later releases don't mention merge-tree anywhere, so... git version: 1.7.0 uname -a: Linux tor 2.6.32-trunk-amd64 #1 SMP Sun Jan 10 22:40:40 UTC 2010 x86_64 GNU/Linux distro: Debian GNU/Linux squeeze/sid Unpack the attached tree, cd into it and run: git merge-tree common master other I get the following result: added in local our 100644 d68dd4031d2ad5b7a3829ad7df6635e27a7daa22 t1.txt Segmentation fault The exit code: 139 BR / Klas
Attachment:
merge-tree_segfault.tar.gz
Description: GNU Zip compressed data