summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2009-04-06 08:31:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-08 05:19:56 (GMT)
commit1c0f3d224eff2ff8ca8442811edb5a6830adba1a (patch)
treeea2abaf978b348dc99b31a304381e6146cdc5c9a /.gitignore
parent8b7332221db8522fe23bf8cf25d058acea6b9142 (diff)
downloadgit-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.zip
git-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.tar.gz
git-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.tar.bz2
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>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions