mirror of
https://github.com/git-for-windows/git.git
synced 2026-02-19 03:07:25 -06:00
This adds diffuse as a built-in merge tool. Signed-off-by: Sebastian Pipping <sebastian@pipping.org> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>