(smerge-font-lock-keywords): Relax submatch 1.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 25 Jan 2001 15:37:21 +0000 (15:37 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 25 Jan 2001 15:37:21 +0000 (15:37 +0000)
commitf0c1adabcb756404ddaeac75c94f72c87a055a5f
treed84bc106a43e07ecaba49eb09279b250db214ebe
parenta2ed96700bf6b23edd41c8d5b7fdb69af48b5c0c
(smerge-font-lock-keywords): Relax submatch 1.
lisp/ChangeLog
lisp/smerge-mode.el