diff options
| author | Dan Nicolaescu | 2008-01-13 20:03:35 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-01-13 20:03:35 +0000 |
| commit | c6a234ac6c8a198b2b627b72bb7d56d22b71638a (patch) | |
| tree | 0ad9468f90f09bdc6dfdb21ea052253a7e9bfe11 /src | |
| parent | f40f5dc36e552879e565e489a4e3a5f19be7e4ea (diff) | |
| download | emacs-c6a234ac6c8a198b2b627b72bb7d56d22b71638a.tar.gz emacs-c6a234ac6c8a198b2b627b72bb7d56d22b71638a.zip | |
* 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.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions