Mercurial > emacs
diff lisp/toolbar/help.pbm @ 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 | b45a8f9db907 |
children | 734ff40978ad |
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 15 Apr 2004 20:46:54 +0000 |
parents | b45a8f9db907 |
children | 734ff40978ad |