From: Jay Soffian <jaysoffian@gmail.com>
Date: Mon, 25 Feb 2008 20:09:04 GMT
Subject: Re: [RFC/PATCH] mergetool: clarify local/remote terminology
Message-ID: <76718490802251209u240bc0b2s8e268c7f1943c3d9@mail.gmail.com>
In-Reply-To: <20080225192106.GB19666@sigill.intra.peff.net>

On Mon, Feb 25, 2008 at 2:21 PM, Jeff King <peff@peff.net> wrote:

>  Probably HEAD and HEAD~5 (perhaps along with their oneline logs). I
>  think the best we can do is "whatever the user said to get us here"
>  which is not something you can calculate after the fact; you have to
>  remember what the user said.

Right, so the porcelain would have to save this information somewhere
for mergetool to access (yes/no/maybe?).

Anyway, that's why the first iteration of my patch takes --left
and --right arguments so at least you can tell it how you got
there.

j.