Mercurial > emacs
comparison lisp/smerge-mode.el @ 30978:e143c9fd35c9
Add display-buffer-reuse-frames,
file-coding-system-alist.
author | Dave Love <fx@gnu.org> |
---|---|
date | Sun, 20 Aug 2000 17:21:22 +0000 |
parents | f7b06560383b |
children | a3d5adc99010 |
comparison
equal
deleted
inserted
replaced
30977:14c0286b43b5 | 30978:e143c9fd35c9 |
---|