Hi, On Tue, 29 Jul 2008, Miklos Vajna wrote: > Testing is done by creating a simple git-merge-theirs strategy which > just picks the upstream tree. (In other words, this is not the opposite > of -s ours.) Actually, this _is_ the opposite of -s ours, no? -s ours just takes our tree, your -s theirs just takes their tree. Sorry for the confusion I caused, 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
