From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 28 Jul 2008 23:54:17 GMT
Subject: Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Message-ID: <alpine.DEB.1.00.0807290153300.2725@eeepc-johanness>
In-Reply-To: <f3af7df2dda2dcb7801314cc993470264259f970.1217288180.git.vmiklos@frugalware.org>

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