Mercurial > emacs
comparison lisp/smerge-mode.el @ 90226:df78f2fb8f6a
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-80
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 531)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 06 Sep 2005 07:30:14 +0000 |
parents | a3716f7538f2 |
children | 10fe5fadaf89 |
comparison
equal
deleted
inserted
replaced
90225:a3716f7538f2 | 90226:df78f2fb8f6a |
---|