From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 23 Nov 2010 01:26:02 +0000 (-0500)
Subject: etc/NEWS: Document vc-update and vc-merge changes.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~151
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c32ce32b5854014510724d3c3b077dca32a70f4;p=emacs.git

etc/NEWS: Document vc-update and vc-merge changes.
---

diff --git a/etc/NEWS b/etc/NEWS
index 4833f13b832..353b3db4e93 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -542,6 +542,24 @@ system or session bus.
 *** The following access methods are discontinued: "ssh1_old",
 "ssh2_old", "scp1_old", "scp2_old" and "fish".
 
+** VC and related modes
+
+*** Support for pulling on distributed version control systems.
+The vc-update command now runs a "pull" operation, if it is supported.
+This updates the current branch from upstream.  A prefix argument
+means to prompt the user for command specifics, e.g. a pull location.
+
+**** vc-pull is an alias for vc-update.
+
+**** Currently supported by Bzr.
+
+*** Support for merging on distributed version control systems.
+The vc-merge command now runs a "merge" operation, if it is supported.
+This merges another branch into the current one.  A prefix argument
+means to prompt the user for command specifics, e.g. a merge location.
+
+**** Currently supported by Bzr.
+
 
 * New Modes and Packages in Emacs 24.1