Mercurial > emacs
view nt/subdirs.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 | 6eee4a78b129 |
| children |
line wrap: on
line source
;; -*- no-byte-compile: t -*- (if (fboundp 'normal-top-level-add-subdirs-to-load-path) (normal-top-level-add-subdirs-to-load-path))