Mercurial > emacs
diff lisp/smerge-mode.el @ 55422:14eb8d4ad4e7
Changes from arch/CVS synchronization
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 07 May 2004 22:09:42 +0000 |
parents | 04a44f089cc1 |
children | 7fa982932904 6ae3d2810507 4c90ffeb71c5 |