Mercurial > emacs

diff etc/JOKES @ 112231:f4a73cf7587b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively. (smerge-resolve--normalize-re): New var. (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. (smerge-resolve): Use them. * lisp/newcomment.el (comment-only-p): New function. (comment-or-uncomment-region): Use it.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 13:10:15 -0500
parents 02e2382f5e8a
children
line wrap: on
line diff