Mercurial > emacs
diff lisp/ediff-merg.el @ 74684:2a54a5dd0df4
(magic-mode-alist): Mark as risky.
(make-backup-file-name-1): Expand backup-directory explicitly.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 17 Dec 2006 18:03:09 +0000 |
parents | 402a04b0362f |
children | e3694f1cb928 6588c6259dfb |