lisp/smerge-mode.el (smerge-resolve): Use null-device rather than a literal "/dev/null".
Attach a file by drag & drop or click to upload