[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/09/28 18:45:47

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11049.2.320
retrieving revision 1.11049.2.321
diff -u -b -r1.11049.2.320 -r1.11049.2.321
--- ChangeLog   28 Sep 2007 01:59:37 -0000      1.11049.2.320
+++ ChangeLog   28 Sep 2007 18:45:43 -0000      1.11049.2.321
@@ -1,5 +1,10 @@
 2007-09-28  Stefan Monnier  <address@hidden>
 
+       * vc-svn.el (vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
+       Used to try and automatically enabled smerge-mode in the presence of
+       conflicts and to call `svn resolved' when the conflicts are gone.
+       (vc-svn-parse-status): Remember the svn-specific status.
+
        * newcomment.el (comment-choose-indent): New function extracted
        from comment-indent.  Improve the alignment algorithm.
        (comment-indent): Use it.