Mercurial > emacs
view .cvsignore @ 78572:5b92bb6e6570
(smerge-resolve): New arg `safe'.
(smerge-resolve-all, smerge-batch-resolve): New function.
(smerge-refine): Make sure `diff' returns the expected result.
(smerge-parsep-re): New const.
(smerge-mode): Use it to adjust paragraph-separate.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 16 Aug 2007 20:04:36 +0000 |
parents | eeb74924d896 |
children | f1d13e615070 |
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 data emacs*.tar.gz leim*.tar.gz lock site-lisp update.log