smerge-mode-menu
smerge-mode-menu is a variable defined in `
smerge-mode.el
'.
Its value is shown
below.
Documentation:
Menu for `smerge-mode'.
Value:
(keymap "SMerge"
(Next menu-item "Next" smerge-next :help "Go to next conflict")
(Previous menu-item "Previous" smerge-prev :help "Go to previous conflict")
(nil-7 menu-item "--")
(Keep\ All menu-item "Keep All" smerge-keep-all :enable
(smerge-check 1)
:help "Keep all three versions")
(Keep\ Current menu-item "Keep Current" smerge-keep-current :enable
(and
(smerge-check 1)
(>
(smerge-get-current)
0))
:help "Use current (at point) version")
(nil-7-5 menu-item "--")
(Revert\ to\ Base menu-item "Revert to Base" smerge-keep-base :enable
(smerge-check 2)
:help "Revert to base version")
(Keep\ Other menu-item "Keep Other" smerge-keep-other :enable
(smerge-check 3)
:help "Keep `other' version")
(Keep\ Yours menu-item "Keep Yours" smerge-keep-mine :enable
(smerge-check 1)
:help "Keep your version")
(nil-7-9 menu-item "--")
(Diff\ Base/Mine menu-item "Diff Base/Mine" smerge-diff-base-mine :enable
(smerge-check 2)
:help "Diff `base' and `mine' for current conflict")
(Diff\ Base/Other menu-item "Diff Base/Other" smerge-diff-base-other :enable
(smerge-check 2)
:help "Diff `base' and `other' for current conflict")
(Diff\ Mine/Other menu-item "Diff Mine/Other" smerge-diff-mine-other :enable
(smerge-check 1)
:help "Diff `mine' and `other' for current conflict")
(nil-7-13 menu-item "--")
(Invoke\ Ediff menu-item "Invoke Ediff" smerge-ediff :enable
(smerge-check 1)
:help "Use Ediff to resolve the conflicts")
(Auto\ Resolve menu-item "Auto Resolve" smerge-resolve :enable
(smerge-check 1)
:help "Try auto-resolution heuristics")
(Combine menu-item "Combine" smerge-combine-with-next :enable
(smerge-check 1)
:help "Combine current conflict with next"))