Hi, On Sun, 5 Apr 2009, Clemens Buchacher wrote: > The segmentation fault is caused by a null pointer dereference which > happens during recursive merge with a submodule conflict between two > merge bases. This is fixed by the following patches. > > However, there are other problems with merging submodules. For example, > git diff aborts with "fatal: read error 'sub'" for conflicting > submodules. I have also added a test for this. > > Dscho has already started working on related issues. I have therefore > skipped t7404, which is already used in Dscho's work. Thanks for working on this, 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
