diff options
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 16693f8a5e3..cd5c7c20f8d 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -81,6 +81,7 @@ Used in `smerge-diff-base-mine' and related functions." (defcustom smerge-auto-refine t "Automatically highlight changes in detail as the user visits conflicts." + :group 'smerge :type 'boolean) (defface smerge-mine |