From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 13 Jun 2009 19:47:08 +0000 (-0700)
Subject: Merge branch 'da/araxis-mergetool'
X-Git-Tag: v1.6.4-rc0~69
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1bbc820414d94452d1417bb83db86309f34720a3;p=git.git

Merge branch 'da/araxis-mergetool'

* da/araxis-mergetool:
  mergetool--lib: add support for araxis merge
---

1bbc820414d94452d1417bb83db86309f34720a3