HCoop / bpt / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 537fd67) | patch
(smerge-remove-props): Make the args non-optional.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 25 Aug 2005 20:13:38 +0000 (20:13 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 25 Aug 2005 20:13:38 +0000 (20:13 +0000)
commit41796d0900f9fbcd4e1d6607746ecb1cb0e3a981
treef93c82155e1025c418834d54a7713d2d63204eactree | snapshot (tar.gz zip)
parent537fd670e9d4ef0012ea3b8acad541cc9f409f42commit | diff
(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.
lisp/ChangeLog diff | blob | blame | history
lisp/smerge-mode.el diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.