diff lisp/smerge-mode.el @ 90341:5754737d1e04

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-34 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 123-134) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 40-48) - Merge from emacs--devo--0 - Update from CVS - Munge arch explicit ids in etc/images to match Emacs
author Miles Bader <miles@gnu.org>
date Fri, 03 Mar 2006 07:48:46 +0000
parents c5406394f567
children 2ecafc6d5db7
line wrap: on
line diff