On Sun, Feb 20, 2011 at 5:04 AM, Jeff King <peff@xxxxxxxx> wrote: > Yeah we can if it's useful, but I'd rather see a prototype merge helper > first. In particular, your merge helper seems like it would help in two > situations: Kind of circular -- the helper depends on - What unresolved cases do we have? - What data can you store from the diff machinery? cheers, m -- martin.langhoff@xxxxxxxxx martin@xxxxxxxxxx -- Software Architect - OLPC - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff -- 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