From: Joseph Reagle <joseph.2008@reagle.org>
Date: Thu, 10 Feb 2011 13:37:16 +0000 (-0500)
Subject: default config for merge tool
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/bd55bd8c37765aaa7a4c9990b8314b6ffe60fcf0?hp=bd55bd8c37765aaa7a4c9990b8314b6ffe60fcf0

default config for merge tool
---