# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 977525957 0
# Node ID 43f31a211e9b2c5e67ddae48b8826c03543f3452
# Parent  509ed3724af094546c0879853e6c11143543be3b
*** empty log message ***

diff -r 509ed3724af0 -r 43f31a211e9b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 22 22:58:57 2000 +0000
+++ b/lisp/ChangeLog	Fri Dec 22 22:59:17 2000 +0000
@@ -1,5 +1,9 @@
 2000-12-22  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* smerge-mode.el (smerge-basic-map): Use `=' rather than `d'.
+	Use minibuffer menu prompt for the `=' prefix.
+	(smerge-command-prefix): Change default to C-^.
+
 	* skeleton.el (skeleton-internal-1): Make sure the first line of
 	the region is also re-indented.
 	(skeleton-end-newline): New var.