Mercurial > emacs
comparison lisp/vc-sccs.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 | 107ccd98fa12 |
| children | 606f2d163a64 8a796568ffce |
comparison
equal
deleted
inserted
replaced
| 87738:8da4f8bf7244 | 87739:28dc34f6a246 |
|---|