* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.