view etc/gnus.pbm @ 54903:922f49230ff5

(smerge-match-conflict): Try to do something sensible for nested conflict markers. (smerge-find-conflict): Better handle errors in smerge-match-conflict.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 15 Apr 2004 20:19:11 +0000
parents 64b63696a512
children
line wrap: on
line source

(binary:image/x-portable-bitmap)