"Sverre Rabbelier" <alturin@xxxxxxxxx> writes: > On Mon, Jul 28, 2008 at 22:07, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> That reminds me of: >> >> http://thread.gmane.org/gmane.comp.version-control.git/89178 >> >> to one of whose messages I sent a response today. > > Mhhh, but the proposed strategy there was in response to the 'insane' > git-merge-theirs version, not to the 'exact opposite of > git-merge-ours' that I refer to now, yes? No. -- 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
