From: Miklos Vajna <vmiklos@frugalware.org>
Date: Mon, 28 Jul 2008 23:58:47 GMT
Subject: Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Message-ID: <20080728235847.GR32057@genesis.frugalware.org>
In-Reply-To: <alpine.DEB.1.00.0807290153300.2725@eeepc-johanness>

On Tue, Jul 29, 2008 at 01:54:17AM +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 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,

Aah. :-)

I did not read the source of git-merge-ours and based on your
description I thought my knowledge / the doc about -s ours was not
correct.

So I guess my original patch was right, then.

Note to self: "take 2" gets messy, time to send a "take 3" soon. ;-)