Mercurial > hg > mercurial-talk

changeset 311:093a6fc8a608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct pull/merge slide
author Martin Geisler <mg@aragost.com>
date Thu, 09 Jun 2011 00:29:44 +0200
parents 204c79c56c8e
children d454c60dc1bd
files pull-merge.tex
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pull-merge.tex
+++ b/pull-merge.tex
@@ -43,7 +43,7 @@
   Merging:
   \begin{itemize}
     \item find common ancestor of $A_2$ and $B_1$: $I$
-    \item compute differences between $I$ and $B_1$
-    \item apply them to $A_2$, taking renames into account
+    \item do three-way merge between $I$, $A_2$, and $B_1$
+    \item merge often $\Rightarrow$ common ancestor is close to tip
   \end{itemize}
 \end{frame}