difftool/mergetool: add diffuse as merge and diff tool
authorSebastian Pipping <sebastian@pipping.org>
Mon, 6 Apr 2009 08:31:23 +0000 (01:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:19:56 +0000 (22:19 -0700)
commit1c0f3d2...4eff2ff8ca8442811edb5a6830adba1a
treeea2abaf...78b348dc99b31a304381e6146cdc5c9acopy hash to clipboard (tree)
parent8b73322...1db8522fe23bf8cf25d058acea6b9142copy hash to clipboard (diff)
Documentation/git-mergetool.txt
Documentation/merge-config.txt
contrib/completion/git-completion.bash
contrib/difftool/git-difftool-helper
contrib/difftool/git-difftool.txt
git-mergetool.sh