Fri, 03 Jun 2005 12:58:47 -0800 mpm hg resolve: merge a given node into the working directory
(0) -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip