[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: |
Mon, 31 Mar 2008 02:57:42 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/03/31 02:57:41
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13256
retrieving revision 1.13257
diff -u -b -r1.13256 -r1.13257
--- ChangeLog 31 Mar 2008 01:59:33 -0000 1.13256
+++ ChangeLog 31 Mar 2008 02:57:39 -0000 1.13257
@@ -1,5 +1,8 @@
2008-03-31 Stefan Monnier <address@hidden>
+ * smerge-mode.el (smerge-apply-resolution-patch): New fun.
+ (smerge-resolve): Add various resolution heuristics.
+
* smerge-mode.el (smerge-refine): Allow highlighting other subparts
in 3-way conflicts.
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2008/03/29
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Michael Albinus, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/03/31