Sebastian Pipping 1c0f3d224e 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>		2009-04-07 22:19:56 -07:00
..
git-difftool	difftool: add a -y shortcut for --no-prompt	2009-04-07 22:19:55 -07:00
git-difftool-helper	difftool/mergetool: add diffuse as merge and diff tool	2009-04-07 22:19:56 -07:00
git-difftool.txt	difftool/mergetool: add diffuse as merge and diff tool	2009-04-07 22:19:56 -07:00