(smerge-diff-buffer-name): Default to *vc-diff*. (smerge-combine-with-next): New function. (smerge-diff): Don't output `wrote /tmp/foo' messages. Insert message if no diffs were found.