David Aguilar b6f0621a46 mergetool--lib: add support for araxis merge ...

Araxis merge is now a built-in diff/merge tool.
This adds araxis to git-completion and updates
the documentation to mention araxis.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2009-05-24 11:21:05 -07:00

8.7 KiB

Raw Permalink Blame History

View Raw