Mercurial > emacs
diff man/pcl-cvs.texi @ 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 | 88224dc74061 |
children | 02b9a9aa5b0c dc002877ce12 e6fdae9180d4 |