[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v |
Date: |
Sat, 20 Oct 2007 06:30:25 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 07/10/20 06:30:19
Index: smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- smerge-mode.el 20 Oct 2007 01:52:21 -0000 1.55
+++ smerge-mode.el 20 Oct 2007 06:30:12 -0000 1.56
@@ -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