Mercurial > hg > mercurial-talk

changeset 193:86603a129577 chopen-2010-09-09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix changeset names in merge example.
author Martin Geisler <mg@aragost.com>
date Thu, 09 Sep 2010 10:48:17 +0200
parents 26f34c2487f8
children 30395e0780bb
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
@@ -39,8 +39,8 @@
   \medskip
   Merging:
   \begin{itemize}
-    \item find common ancestor of $A_3$ and $B_1$: $I$
+    \item find common ancestor of $A_2$ and $B_1$: $I$
     \item compute differences between $I$ and $B_1$
-    \item apply them to $A_3$, taking renames into account
+    \item apply them to $A_2$, taking renames into account
   \end{itemize}
 \end{frame}