comparison man/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 0085c454b9b1
children f0e658f3bd2e
comparison
equal deleted inserted replaced
54903:922f49230ff5 54904:a23bbf466906