On Mon, Feb 25, 2008 at 2:21 PM, Jeff King <peff@xxxxxxxx> 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. - 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