Wed, 10 Aug 2011 08:50:38 -0600 dealing with merge failure
Kevin Walker <kevin@canyon23.net> [Wed, 10 Aug 2011 08:50:38 -0600] rev 870
dealing with merge failure
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 tip