# HG changeset patch
# User Thien-Thi Nguyen <ttn@gnuvola.org>
# Date 1233579692 0
# Node ID 88331f228f404e9721931b3e84a68730ba2dea6b
# Parent  1d5d501c3c03802c472c15cfdc406a91f253dbfd
*** empty log message ***

diff -r 1d5d501c3c03 -r 88331f228f40 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Feb 02 13:01:06 2009 +0000
+++ b/lisp/ChangeLog	Mon Feb 02 13:01:32 2009 +0000
@@ -1,3 +1,7 @@
+2009-02-02  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+	* smerge-mode.el (smerge-start-session): Add interactive spec.
+
 2009-02-02  Glenn Morris  <rgm@gnu.org>
 
 	* mail/rmail.el (rmail-ignored-headers, rmail-displayed-headers)