diff lisp/smerge-mode.el @ 90097:380964b11586

Changes from arch/CVS synchronization
author Miles Bader <miles@gnu.org>
date Mon, 31 Jan 2005 00:22:22 +0000
parents 4c90ffeb71c5
children 02f1dbc4a199
line wrap: on
line diff