diff lisp/smerge-mode.el @ 86304:99e2a607922a

New file, with info from <http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01480.html>
author Glenn Morris <rgm@gnu.org>
date Thu, 22 Nov 2007 07:02:04 +0000
parents 860a7a8e779e
children 107ccd98fa12 53108e6cea98
line wrap: on
line diff