Hi, On Tue, 19 Dec 2006, Luben Tuikov wrote: > Auto-merging init/version.c > /home/luben/bin/git-merge: line 394: 12030 > Segmentation fault git-merge-$strategy $common -- "$head_arg" "$@" Do you have any pointers how to get the two branches you try to merge? I'd be most grateful to have the sha1's of both heads, too... Ciao, Dscho - 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