Mercurial > emacs

diff lisp/emulation/viper-cmd.el @ 93983:955774916817

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-apply-resolution-patch): Fix typo. (smerge-resolve): Merge the "2-way refinement" case with one half of the "mere whitespace" resolution.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 11 Apr 2008 01:10:43 +0000
parents d7554c14325c
children eb7b2376cae5
line wrap: on
line diff