Mercurial > emacs
diff configure @ 78914:9eca5b992f1f
(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 | 94efc47b8b8b |
children | 356a01f90f6d 5039706521c9 |