On Mon, Jul 28, 2008 at 22:20, Junio C Hamano <gitster@xxxxxxxxx> wrote: > "Sverre Rabbelier" <alturin@xxxxxxxxx> writes: >> 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. Nanako Shiraishi's patch was not in response to the "git-merge-theirs" thread, or I am missing something here....? -- Cheers, Sverre Rabbelier -- 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
