changeset 334:7f0f688050ae zurich-2012-02-03

Smaller skips on pull/merge frame
author Martin Geisler <mg@aragost.com>
date Thu, 02 Feb 2012 16:04:13 +0100
parents d1daadb755cc
children b7d510337ae0
files pull-merge.tex
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pull-merge.tex
+++ b/pull-merge.tex
@@ -36,23 +36,23 @@
     \draw<5> (B) -- node[below] {\cmd{pull}} (A);
     \node<6>[above] at (alice-end.north) {\cmd{merge}};
   \end{tikzpicture}
+  \smallskip
 
   \onslide<7->
 
-  \medskip
   Changesets:
   \begin{itemize}
   \item atomic repository-wide snapshot
   \item very similar to a \alert{baseline} in ClearCase UCM
   \end{itemize}
+  \smallskip
 
   \onslide<8->
 
-  \medskip
   Merging:
   \begin{itemize}
-    \item find common ancestor of $A_2$ and $B_1$: $I$
-    \item do three-way merge between $I$, $A_2$, and $B_1$
-    \item merge often $\Rightarrow$ common ancestor is close to tip
+  \item find common ancestor of $A_2$ and $B_1$: $I$
+  \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}