On Fri, Feb 18, 2011 at 09:09:13PM +1300, Chris Packham wrote: > Add support for Beyond Compare as a diff/merge tool. > > Signed-off-by: Chris Packham <judge.packham@xxxxxxxxx> > --- > > I wasn't sure about whether git should have support for non-free external > tools. Then I saw that support for Araxis had been added in b6f0621a, which > I've used as a guide for this patch. You right, there is no specific reason not to support non-free merge tools in mergetool; the major issue is testing. The patch looks reasonable but I would prefer to see independent confirmation - especially on windows, Beyond Compares' most popular supported platform - before this patch is merged. Charles. -- 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