mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine.

Browse source
This commit is contained in:
Juri Linkov 2021-08-04 23:43:21 +03:00
parent 1910800f93
commit 4b729ff608
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/vc/smerge-mode.el
View file

@ -214,6 +214,9 @@ Used in `smerge-diff-base-upper' and related functions."
["Invoke Ediff" smerge-ediff
:help "Use Ediff to resolve the conflicts"
:active (smerge-check 1)]
["Refine" smerge-refine
:help "Highlight different words of the conflict"
:active (smerge-check 1)]
["Auto Resolve" smerge-resolve
:help "Try auto-resolution heuristics"
:active (smerge-check 1)]