[Emacs-commit] emacs/lisp smerge-mode.el ChangeLog [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/08/16 20:04:39

Modified files:
        lisp           : smerge-mode.el ChangeLog 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&only_with_tag=EMACS_22_BASE&r1=1.50.2.1&r2=1.50.2.2
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_22_BASE&r1=1.11049.2.225&r2=1.11049.2.226