Mercurial > emacs

diff lisp/smerge-mode.el @ 91073:4bc33ffdda1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author Miles Bader <miles@gnu.org>
date Sat, 27 Oct 2007 09:12:07 +0000
parents 12589730c028 786d3a985758
children 880960b70474
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Sat Oct 27 00:30:50 2007 +0000
+++ b/lisp/smerge-mode.el	Sat Oct 27 09:12:07 2007 +0000
@@ -81,6 +81,7 @@
 
 (defcustom smerge-auto-refine t
   "Automatically highlight changes in detail as the user visits conflicts."
+  :group 'smerge
   :type 'boolean)
 
 (defface smerge-mine