Mercurial > emacs
diff ChangeLog @ 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 | d565588823bd |
children | 798d3ee76081 1029206e72f2 |
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 15 Apr 2004 20:46:54 +0000 |
parents | d565588823bd |
children | 798d3ee76081 1029206e72f2 |