Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: move the bulk of simplemerge into core
Sun, 03 Feb 2008 21:47:07 -0200 Alexis S. L. Carvalho merge with crew-stable
(0) -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip