Skip to content

GitLab

Switch branch/tag
Find file BlameHistoryPermalink
  • Stefan Monnier's avatar
    (smerge-auto-leave): New function and variable. · f97e9a8a
    Stefan Monnier authored 
    (smerge-basic-map): Rename from smerge-basic-keymap.
Change the bindings for smerge-diff-*.
(smerge-*-map): Use easy-mmode-defmap.
(smerge-(next|prev)): Use easy-mmode-define-navigation.
(smerge-keep-*): Use smerge-auto-leave.
    f97e9a8a
smerge-mode.el 13.3 KB