Wed, 21 Apr 2010 11:57:45 -0500 David Champion merge: tool.premerge=keep will leave premerge markers in $local
(0) -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip