diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-09-28 18:45:43 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-09-28 18:45:43 +0000 |
| commit | 1c67a81478ffb168a097a068c2bacee6adf48bcf (patch) | |
| tree | 955691d7d4df545068e0a0b23928162a28ca20fa /lisp/allout.el | |
| parent | 2e24a955f8a4c16ff47489709672a41e430ad214 (diff) | |
| download | emacs-1c67a81478ffb168a097a068c2bacee6adf48bcf.tar.gz | |
(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.
Diffstat (limited to 'lisp/allout.el')
0 files changed, 0 insertions, 0 deletions