Fri, 17 Jun 2005 08:50:55 -0800 mpm Tidy up conflict and pull tests
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip