Mercurial > emacs
view man/.cvsignore @ 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 | 17f1d9e091ba |
| children | 14c4a6aac623 |
line wrap: on
line source
*.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log *.op *.ops *.pdf *.pg *.pgs *.ps *.tmp *.toc *.tp *.tps *.vr *.vrs Makefile makefile