Mercurial > emacs

diff lisp/ChangeLog @ 78914:9eca5b992f1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 28 Sep 2007 18:45:43 +0000
parents 545574ac320d
children 4991e655a1cc
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Sep 28 05:36:04 2007 +0000
+++ b/lisp/ChangeLog	Fri Sep 28 18:45:43 2007 +0000
@@ -1,5 +1,10 @@
 2007-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* 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.