HCoop / bpt / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2e24a95) | patch
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 28 Sep 2007 18:45:43 +0000 (18:45 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 28 Sep 2007 18:45:43 +0000 (18:45 +0000)
commit1c67a81478ffb168a097a068c2bacee6adf48bcf
tree955691d7d4df545068e0a0b23928162a28ca20fatree | snapshot (tar.gz zip)
parent2e24a955f8a4c16ff47489709672a41e430ad214commit | diff
(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.
lisp/ChangeLog diff | blob | blame | history
lisp/vc-svn.el diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.