Thu, 22 Jul 2010 12:20:42 -0600 resolving conflict
Kevin Walker <kevin@canyon23.net> [Thu, 22 Jul 2010 12:20:42 -0600] rev 473
resolving conflict
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip