|
| From: | Dan Nicolaescu |
| Subject: | [Emacs-commit] emacs/lisp vc.el vc-cvs.el ChangeLog |
| Date: | Sun, 13 Jan 2008 20:03:37 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/13 20:03:37
Modified files:
lisp : vc.el vc-cvs.el ChangeLog
Log message:
* 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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.511&r2=1.512
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-cvs.el?cvsroot=emacs&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.12568&r2=1.12569
| [Prev in Thread] | Current Thread | [Next in Thread] |