--- Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
> 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...
The source tree is Linus' "master" tree. The destination tree
is my own "dev" tree, which I use as an intermediate tree, before
merging into my own kernel trees.
Hopefully with the backtrace I posted and with the big-bisect
results pointing to the culprit commit, someone can get a patch out
to fix this.
Luben
-
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