Mercurial > emacs
view man/.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 | 17f1d9e091ba |
| children | 14c4a6aac623 |
line wrap: on
line source
*.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log *.op *.ops *.pdf *.pg *.pgs *.ps *.tmp *.toc *.tp *.tps *.vr *.vrs Makefile makefile