]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ef3e917) | patch
(smerge-mode-menu): Fix activate pred for resolve.
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 23 Mar 2004 19:56:42 +0000 (19:56 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 23 Mar 2004 19:56:42 +0000 (19:56 +0000)
commit5bd8d87b8563f93070292d95144b03793a930104
treed91d8881f3117b3a86d593180bbc34aec8c12f0etree | snapshot
parentef3e91755f45be240466d5d62178a5eeeecc36bacommit | diff
(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.
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.