Mercurial > emacs
diff src/m/irist.h @ 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 | 695cf19ef79e |
children | 23a17af379b1 375f2633d815 |