[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 4b729ff: * lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu it
From: |
Juri Linkov |
Subject: |
master 4b729ff: * lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine. |
Date: |
Wed, 4 Aug 2021 16:43:56 -0400 (EDT) |
branch: master
commit 4b729ff60887f2de320a99cf1fb4c734d1145b00
Author: Juri Linkov <juri@linkov.net>
Commit: Juri Linkov <juri@linkov.net>
* 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 694d452..956d9b3 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)]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 4b729ff: * lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine.,
Juri Linkov <=