Tue, 17 May 2005 01:07:57 -0800 mpm Add "HG: merge resolve" to editor text for merge
(0) -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip