Mercurial > emacs

diff lisp/battery.el @ 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 73661ddc7ac7
children 606f2d163a64 ba8704a0f1e5
line wrap: on
line diff