diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-08-25 20:13:38 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-08-25 20:13:38 +0000 |
| commit | 41796d0900f9fbcd4e1d6607746ecb1cb0e3a981 (patch) | |
| tree | f93c82155e1025c418834d54a7713d2d63204eac /src | |
| parent | 537fd670e9d4ef0012ea3b8acad541cc9f409f42 (diff) | |
| download | emacs-41796d0900f9fbcd4e1d6607746ecb1cb0e3a981.tar.gz | |
(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.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions