Andrew's git / gitweb.git / diff
?
Merge branch 'da/araxis-mergetool'
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:47:08 +0000 (12:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Jun 2009 19:47:08 +0000 (12:47 -0700)
* da/araxis-mergetool:
mergetool--lib: add support for araxis merge

1  2 
contrib/completion/git-completion.bash patch | diff1 | diff2 | blob | history
diff --cc contrib/completion/git-completion.bash
Simple merge