Mercurial > emacs

view nt/subdirs.el @ 54527:192fc783e115

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-mode-menu): Fix activate pred for resolve. (smerge-context-menu-map): Remove unused var. (smerge-keep-all): Preserve markers. (smerge-keep-n): New fun. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-ediff): Use it. (smerge-kill-current): Use it. Make it work on some 3-part conflicts. (smerge-popup-context-menu): Also use context-menu on 3-part conflicts. (smerge-resolve): Resolve trivial 3-part conflicts.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 23 Mar 2004 19:56:42 +0000
parents b5c421a7a5c2
children 6eee4a78b129
line wrap: on
line source

(if (fboundp 'normal-top-level-add-subdirs-to-load-path)
    (normal-top-level-add-subdirs-to-load-path))