view .cvsignore @ 87739:28dc34f6a246

* vc.el (vc-update): Resolve conflicts if necessary instead of just updating the buffer. * vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the update command so that we can parse the output.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 13 Jan 2008 20:03:35 +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