tree c054ccc5f9f12c8db69de036c9d868a458ca2d48
parent 4481ff048df4c86021d783de6f099909495f04ff
author David Aguilar <davvid@gmail.com> 1243124681 +0000
committer Junio C Hamano <gitster@pobox.com> 1243189265 -0700

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>