From: Joseph Reagle <joseph.2008@reagle.org>
Date: Mon, 7 Feb 2011 15:55:14 +0000 (-0500)
Subject: fix 3s pause between commits
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/0fd427e4d8338db887144403bc993ce8247ada78?hp=0fd427e4d8338db887144403bc993ce8247ada78

fix 3s pause between commits
make config of merge tool more agnostic
---