Mercurial > emacs
view .cvsignore @ 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 | 02b93a943c85 |
| children | 6ed8d3e25c65 |
line wrap: on
line source
*.xdelta .DS_Store .arch-inventory Makefile autom4te.cache bin boot.log boot.log.diff boot.log.old config.cache config.log config.status configure emacs*.tar.gz leim*.tar.gz update.log