This adds diffuse as a built-in merge tool.
Signed-off-by: NSebastian Pipping <sebastian@pipping.org>
Signed-off-by: NDavid Aguilar <davvid@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>