On Tue, Jul 29, 2008 at 01:54:17AM +0200, Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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. ;-)
Attachment:
pgpq7CEn64Cfa.pgp
Description: PGP signature
