Mercurial > emacs
view lisp/.cvsignore @ 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 | 2e95191b77c0 |
children | bae03e1f7131 |
line wrap: on
line source
*.elc MANIFEST Makefile Makefile.unix makefile elc.tar.gz cus-load.el finder-inf.el subdirs.el loaddefs.el