diff options
| author | David Aguilar <davvid@gmail.com> | 2009-05-24 00:24:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-24 11:21:05 -0700 |
| commit | b6f0621a462e4ff11999c8e2d8279c0ffd3be201 (patch) | |
| tree | c054ccc5f9f12c8db69de036c9d868a458ca2d48 /contrib/vim | |
| parent | 4481ff048df4c86021d783de6f099909495f04ff (diff) | |
| download | git-b6f0621a462e4ff11999c8e2d8279c0ffd3be201.tar.gz git-b6f0621a462e4ff11999c8e2d8279c0ffd3be201.tar.xz | |
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>
Diffstat (limited to 'contrib/vim')
0 files changed, 0 insertions, 0 deletions