Mercurial > emacs
comparison lisp/pgg-gpg.el @ 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 | 73661ddc7ac7 |
| children | 28c09613eb50 1e3a407766b9 |
comparison
equal
deleted
inserted
replaced
| 87738:8da4f8bf7244 | 87739:28dc34f6a246 |
|---|