![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Jun 2009 19:47:08 +0000 (12:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Jun 2009 19:47:08 +0000 (12:47 -0700) | ||
| commit | 1bbc820414d94452d1417bb83db86309f34720a3 | |
| tree | 2eb3a4843174f6999a290da3e5b7c5b55173701a | tree | snapshot |
| parent | b8364903c3e4cde713102e4a36d3926b020b0f70 | commit | diff |
| parent | b6f0621a462e4ff11999c8e2d8279c0ffd3be201 | commit | diff |
Merge branch 'da/araxis-mergetool'
* da/araxis-mergetool:
mergetool--lib: add support for araxis merge
* da/araxis-mergetool:
mergetool--lib: add support for araxis merge
| contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |