mergetool--lib: add support for araxis merge
authorDavid Aguilar <davvid@gmail.com>
Sun, 24 May 2009 00:24:41 +0000 (00:24 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 May 2009 18:21:05 +0000 (11:21 -0700)
commitb6f0621...462e4ff11999c8e2d8279c0ffd3be201
treec054ccc...f9f12c8db69de036c9d868a458ca2d48copy hash to clipboard (tree)
parent4481ff0...8df4c86021d783de6f099909495f04ffcopy hash to clipboard (diff)
Documentation/git-difftool.txt
Documentation/git-mergetool.txt
Documentation/merge-config.txt
contrib/completion/git-completion.bash
git-mergetool--lib.sh