diff options
| author | Dan Nicolaescu | 2008-01-14 07:38:05 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-01-14 07:38:05 +0000 |
| commit | ba463d9eca5f05817eb843372ebc9e46ecbb471f (patch) | |
| tree | bc0b28bf00715380c7a0ea0d59e1bcbc6a1e1e48 /src | |
| parent | 944df51178e5c6617e89d28a2e6797b02550fde0 (diff) | |
| download | emacs-ba463d9eca5f05817eb843372ebc9e46ecbb471f.tar.gz emacs-ba463d9eca5f05817eb843372ebc9e46ecbb471f.zip | |
* smerge-mode.el (smerge-auto): New function.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook):
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
(top-level): Add a Todo list.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions