Mercurial > emacs

diff src/widget.c @ 78572:5b92bb6e6570

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 922696f363b0
children fc2bcd2a8aad 65663fcd2caa f55f9811f5d7
line wrap: on
line diff