From: Sebastian Pipping <sebastian@pipping.org>
Date: Mon, 6 Apr 2009 08:31:23 +0000 (-0700)
Subject: difftool/mergetool: add diffuse as merge and diff tool
X-Git-Tag: v1.6.3-rc1~13^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1c0f3d224eff2ff8ca8442811edb5a6830adba1a?hp=1c0f3d224eff2ff8ca8442811edb5a6830adba1a

difftool/mergetool: add diffuse as merge and diff tool

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>
---