Mercurial > emacs

comparison BUGS @ 87739:28dc34f6a246

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 8ce686bd7f4f
children fb8bf24d2eb9
comparison
equal deleted inserted replaced
87738:8da4f8bf7244 87739:28dc34f6a246