Mercurial > emacs
view .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 | eeb74924d896 |
children | f1d13e615070 |
line wrap: on
line source
*.xdelta .DS_Store .arch-inventory Makefile autom4te.cache bin boot.log boot.log.diff boot.log.old config.cache config.log config.status configure data emacs*.tar.gz leim*.tar.gz lock site-lisp update.log