Sat, 16 Nov 2013 12:34:05 -0500 Matt Mackall merge with i18n stable
Fri, 15 Nov 2013 13:20:49 -0800 Durham Goode contrib: add editmerge script for editor conflict prompts
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip