[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v |
Date: |
Mon, 14 Jan 2008 07:38:09 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/14 07:38:06
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12569
retrieving revision 1.12570
diff -u -b -r1.12569 -r1.12570
--- ChangeLog 13 Jan 2008 20:03:35 -0000 1.12569
+++ ChangeLog 14 Jan 2008 07:38:05 -0000 1.12570
@@ -1,3 +1,12 @@
+2008-01-14 Dan Nicolaescu <address@hidden>
+
+ * smerge-mode.el (smerge-auto): New function.
+ * vc-svn.el (vc-svn-find-file-hook):
+ * vc-arch.el (vc-arch-find-file-hook):
+ * pcvs.el (cvs-revert-if-needed):
+ * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
+ (top-level): Add a Todo list.
+
2008-01-13 Dan Nicolaescu <address@hidden>
* vc.el (vc-update): Resolve conflicts if necessary instead of
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/01/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Martin Rudalics, 2008/01/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Jason Rumney, 2008/01/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Jason Rumney, 2008/01/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Jason Rumney, 2008/01/11
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Jason Rumney, 2008/01/12
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/01/12
- [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 <=
- [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, 2008/01/15
- [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