Jeff King <peff@xxxxxxxx> writes: > The big question here is what we want the output to look like. I chose > this: > > diff --combined foo > index 7ea6ded,6197570..9563691 > Binary files differ > > which contains all of the information we have: for file "foo" there were > two parents (at 7ea6ded and 6197570 respectively), and the resolution > was 9563691. Yeah, I think the above is sane and matches more-or-less the conclusion of the previous discussion Michael quoted. I've only read up to this patch (I wanted to conclude the first round of today's integration round before 17:00 local) and they all looked good; will queue the whole thing to 'pu' in the meantime. -- 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