Mercurial > emacs
view lib-src/.cvsignore @ 65129:8303172e4c68
(smerge-remove-props): Make the args non-optional.
(smerge-keep-n): Remove props.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-kill-current): Don't remove props anymore
now that it's done in smerge-keep-n.
(smerge-refined-change): New face.
(smerge-refine-chopup-region, smerge-refine-highlight-change)
(smerge-refine): New funs.
(smerge-basic-map): Bind smerge-refine.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 25 Aug 2005 20:13:38 +0000 |
parents | 29718f221424 |
children | adbf7c56937f |
line wrap: on
line source
DOC Makefile.c b2m ctags* cvtmail digest-doc ebrowse emacsclient emacsserver etags fakemail getopt.h hexl make-docfile movemail obj profile sorted-doc test-distrib update-game-score yow Makefile *-spd *.pdb