From 4b729ff60887f2de320a99cf1fb4c734d1145b00 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 4 Aug 2021 23:43:21 +0300 Subject: [PATCH] * lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine. --- lisp/vc/smerge-mode.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 694d4529b97..956d9b38017 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -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)] -- 2.39.2