[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v |
Date: |
Tue, 15 Jan 2008 21:40:13 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/01/15 21:40:11
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12577
retrieving revision 1.12578
diff -u -b -r1.12577 -r1.12578
--- ChangeLog 15 Jan 2008 15:03:36 -0000 1.12577
+++ ChangeLog 15 Jan 2008 21:40:09 -0000 1.12578
@@ -1,3 +1,8 @@
+2008-01-15 Stefan Monnier <address@hidden>
+
+ * smerge-mode.el (smerge-refine): Also work on "same change conflicts".
+ (smerge-makeup-conflict): New command.
+
2008-01-15 Thien-Thi Nguyen <address@hidden>
* log-edit.el (log-edit): Doc fix.
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Martin Rudalics, 2008/01/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Martin Rudalics, 2008/01/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/01/13
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Alan Mackenzie, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Michael Albinus, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Alan Mackenzie, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/15
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Alan Mackenzie, 2008/01/15
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/01/15
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/01/16
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/01/16
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/16
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/16
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/16
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/16
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/01/16