Mercurial > emacs

diff lisp/ediff-util.el @ 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 9355f9b7bbff
children 73661ddc7ac7 b98604865ea0
line wrap: on
line diff