From 33eb8323b5dae576c80d9a2139e5c3bd07515078 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 7 Jul 2025 15:30:50 +0100 Subject: [PATCH] ; * doc/emacs/maintaining.texi (VC With A Merging VCS): Fix wording. (cherry picked from commit f85f3c30ddc986e6d6c6ae738cee578556cc0eac) --- doc/emacs/maintaining.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 1a893a83860..664d2fd8be9 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -573,9 +573,9 @@ without first cancelling the commit by typing @kbd{C-c C-k} in the marked in the @file{*vc-dir*} buffer after Emacs has already popped up the @file{*vc-log*} buffer, the old fileset will remain in effect for this commit. (This is in contrast to changes made to the -@emph{contents} of files in the fileset: all such changes will be -included in the commit even if they are made after Emacs has popped up -the @file{*vc-dir*} buffer.) +@emph{contents} of files in the fileset when not committing patches: all +such changes will be included in the commit even if they are made after +Emacs has popped up the @file{*vc-log*} buffer.) When you cancel a commit, Emacs saves your log message. This means that if you need to adjust the fileset or patches, it is easy to restart the -- 2.39.5