![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | David Aguilar <davvid@gmail.com> | |
| Sun, 24 May 2009 00:24:41 +0000 (00:24 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 May 2009 18:21:05 +0000 (11:21 -0700) | ||
| commit | b6f0621a462e4ff11999c8e2d8279c0ffd3be201 | |
| tree | c054ccc5f9f12c8db69de036c9d868a458ca2d48 | tree | snapshot |
| parent | 4481ff048df4c86021d783de6f099909495f04ff | commit | diff |
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>
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>