From 8a284cbbc588d19d48ffbd159dfa506da468e351 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 30 Aug 2025 15:54:32 +0100 Subject: [PATCH] ; Fix `(emacs)Merge Bases' Intended to be included in previous commit. --- doc/emacs/vc1-xtra.texi | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index c96f21f0c83..41058aefce5 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -247,20 +247,13 @@ another (@code{vc-log-mergebase}). @c more than one branch for older VCS? This needs thinking through if @c any of our centalized VCS gain support for these commands. The @dfn{merge base} of two branches is the most recent revision that -exists on both branches. If neither of the branches were ever merged +exists on both branches. If neither of the branches was ever merged into the other (@pxref{Merging}), then the merge base is the revision that the older of the two branches was at when the newer branch was created from it (@pxref{Creating Branches}). If one of the branches was ever merged into the other, then the merge base is the most recent merge point. -With this understood, we can generalize the concept of a merge base from -branches to any two revisions. The merge base of two revisions is the -most recent revision that can be found in the revision history of both -of the two revisions.@footnote{In fact the concept generalizes to any -number of revisions, but Emacs's commands for merge bases work with only -two, so we limit ourselves to that.} - The commands described in this section are currently implemented only for decentralized version control systems (@pxref{VCS Repositories}).