Mercurial > emacs
diff lisp/net/rcompile.el @ 93983:955774916817
(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 | 21873b86ecb7 |
children | 924fe8b4e375 91e5880a36c1 |