Mercurial > emacs
comparison admin/admin.el @ 87743:c2a952d12e21
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 14 Jan 2008 07:38:05 +0000 |
| parents | 5c2a2ef4063c |
| children | 606f2d163a64 e6db9ee945b8 |
comparison
equal
deleted
inserted
replaced
| 87742:25f1614da585 | 87743:c2a952d12e21 |
|---|