Mercurial > emacs
comparison lisp/ediff-diff.el @ 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 | 7c8949dbfa0d |
| children | 73661ddc7ac7 a2b33caadccd 424b655804ca |
comparison
equal
deleted
inserted
replaced
| 78913:fbe123a50f74 | 78914:9eca5b992f1f |
|---|