Arkadiusz Miskiewicz <arekm@xxxxxxxx> wrote: > > We no longer require external merge tools. > Starting from which version? Not released yet, its sitting in 'next'. Hopefully 1.5. -- Shawn. - 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