fix 3s pause between commits
authorJoseph Reagle <joseph.2008@reagle.org>
Mon, 7 Feb 2011 15:55:14 +0000 (10:55 -0500)
committerJoseph Reagle <joseph.2008@reagle.org>
Mon, 7 Feb 2011 15:55:14 +0000 (10:55 -0500)
make config of merge tool more agnostic


No differences found

Benjamin Mako Hill || Want to submit a patch?