From: Juri Linkov <juri@linkov.net>
Date: Wed, 4 Aug 2021 20:43:21 +0000 (+0300)
Subject: * lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine.
X-Git-Tag: emacs-28.0.90~1591^2~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b729ff60887f2de320a99cf1fb4c734d1145b00;p=emacs.git

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

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)]