Mercurial > emacs
comparison move-if-change @ 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 | 354e0c45cedf |
| children | 14a97ab281d5 |
comparison
equal
deleted
inserted
replaced
| 78571:fd7a34f481ad | 78572:5b92bb6e6570 |
|---|