view lisp/url/.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 3fb37923e567
children
line wrap: on
line source

Makefile
auto-autoloads.el
custom-load.el
url-auto.el