- don't clear marks after merging them in...

- blargh. buffers weren't initialized properly

(0) -30 -10 -2 +2 +10 +30 tip

mercurial