Mercurial > hg > mercurial-talk
changeset 329:d3c8c0b3ab3c
Mention changeset <-> baseline connection
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Thu, 02 Feb 2012 12:53:24 +0100 |
parents | d1977475d41c |
children | f6b3bad87fa3 |
files | pull-merge.tex |
diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pull-merge.tex +++ b/pull-merge.tex @@ -40,6 +40,15 @@ \onslide<7-> \medskip + Changesets: + \begin{itemize} + \item atomic repository-wide snapshot + \item very similar to a \alert{baseline} in UCM ClearCase + \end{itemize} + + \onslide<8-> + + \medskip Merging: \begin{itemize} \item find common ancestor of $A_2$ and $B_1$: $I$