(smerge-match-conflict): Fix last change.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:46:54 +0000 (20:46 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:46:54 +0000 (20:46 +0000)
commit2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3
tree8a5b32b5a7d3ea407d5ad77c936aa96f3cd04306
parent9f0c286d22c49f88af21e00532e2fd232f748c99
(smerge-match-conflict): Fix last change.
lisp/smerge-mode.el