diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-23 19:56:42 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-23 19:56:42 +0000 |
| commit | 5bd8d87b8563f93070292d95144b03793a930104 (patch) | |
| tree | d91d8881f3117b3a86d593180bbc34aec8c12f0e /lisp/emacs-lisp/autoload.el | |
| parent | ef3e91755f45be240466d5d62178a5eeeecc36ba (diff) | |
| download | emacs-5bd8d87b8563f93070292d95144b03793a930104.tar.gz emacs-5bd8d87b8563f93070292d95144b03793a930104.tar.bz2 emacs-5bd8d87b8563f93070292d95144b03793a930104.zip | |
(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.
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
0 files changed, 0 insertions, 0 deletions