[merge addon] Use CodeMirror-merge-* CSS class names

Since the addon is called merge, not diff.