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

- blargh. buffers weren't initialized properly

- reformatting

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

mercurial