Mercurial > emacs
comparison lisp/smerge-mode.el @ 83002:e654e1383970
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-16
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-42
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 03 Jan 2004 16:53:54 +0000 |
parents | f0eb34e60705 |
children | fac24544c283 |
comparison
equal
deleted
inserted
replaced
83001:67a56c2e50c6 | 83002:e654e1383970 |
---|