Minor portability fix in smerge-mode.el.

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f970195..aef0246 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * smerge-mode.el (smerge-resolve): Use null-device rather than a
+       literal "/dev/null".
+
 2011-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):