Mercurial > emacs
diff lisp/vc.el @ 54904:a23bbf466906
(smerge-match-conflict): Fix last change.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 15 Apr 2004 20:46:54 +0000 |
parents | 494d96bf5f98 |
children | 40b3b405fe21 eb7e8d483840 |