\begin{slide}{CVS -- Merge}

\begin{itemize} \itemsep 0pt
\item 9:00 Heinz: checkout (Revision $A$)
\item 9:10 Klaus: checkout (Revision $A$)
\item 9:20 Heinz: editiert ($A \to H$)
\item 9:30 Klaus: editiert ($A \to K$)
\item 9:40 Heinz: commit   ($H$)
\item 9:50 Klaus: commit   

  \verb|up-to-date check failed|
\item 9:51 Klaus: update   

  \verb|merging differences|
  \verb|between| $A$ \verb|and| $H$ \verb|into| $K$
\item 9:52 Klaus: commit  
\end{itemize}
\end{slide}

