add graphic for example3

grafiken/ex3-graph-premerge.tex

+\documentclass{standalone}
+
+\input{theme}
+\input{versiongraph}
+
+\begin{document}
+\begin{tikzpicture}[versionsgraph]
+	\commit{\rootcommit}{lightblue}{};
+	\commit[right=of \rootcommit]{\pepcommit}{lightblue}{\rootcommit};
+	\commit[above right=of \pepcommit]{\sortcommit}{lightred}{\pepcommit};
+	\commit[right=of \sortcommit]{\refactorcommit}{lightred}{\sortcommit};
+
+	\commit[right=of \pepcommit]{\proofcommit}{lightblue}{\pepcommit};
+
+	\branch[right=of \proofcommit]{master}{\proofcommit}
+	\branch[above right=of \refactorcommit]{performance}{\refactorcommit}
+	\message{\rootcommit}{initial}
+	\message{\pepcommit}{pep8}
+	\message[above=of \sortcommit]{\sortcommit}{presort}
+	\message[above=of \refactorcommit]{\refactorcommit}{refactor}
+	\message{\proofcommit}{create proof}
+	\HEAD{master}
+\end{tikzpicture}
+\end{document}

grafiken/ex3-graph.tex

+\documentclass{standalone}
+
+\input{theme}
+\input{versiongraph}
+
+\begin{document}
+\begin{tikzpicture}[versionsgraph]
+	\commit{\rootcommit}{lightblue}{};
+	\commit[right=of \rootcommit]{\pepcommit}{lightblue}{\rootcommit};
+	\commit[above right=of \pepcommit]{\sortcommit}{lightred}{\pepcommit};
+	\commit[right=of \sortcommit]{\refactorcommit}{lightred}{\sortcommit};
+
+	\commit[right=of \pepcommit]{\proofcommit}{lightblue}{\pepcommit};
+
+	\commit[right=of \proofcommit, xshift=1.2cm]{\mergecommit}{lightblue}{\proofcommit,\refactorcommit};
+
+	\branch{master}{\mergecommit}
+	\branch[above right=of \refactorcommit]{performance}{\refactorcommit}
+	\message{\rootcommit}{initial}
+	\message{\pepcommit}{pep8}
+	\message[above=of \sortcommit]{\sortcommit}{presort}
+	\message[above=of \refactorcommit]{\refactorcommit}{refactor}
+	\message{\mergecommit}{merge performance into master}
+	\message{\proofcommit}{create proof}
+	\HEAD{master}
+\end{tikzpicture}
+\end{document}

presentation/presentation.tex

@@ -338,27 +338,26 @@
 		\item branch \code{B} zeigt nun auf diesen commit
 		\item \code{tree} des commits enthält gemerget Version
 	\end{itemize}
-	\center {\huge \alert{Grafik: Example für 3wm}} \\
-	{\huge \alert{Grafik: ergebnis}}
+	\center
+	\begin{figure}
+		\only<1>{\includegraphics{../grafiken/merge-three-way-premerge}}
+		\only<2>{\includegraphics{../grafiken/merge-three-way}}
+	\end{figure}
 \end{frame}
 
 \subsection{Beispiel merge}
 \begin{frame}
-	\frametitle{\subsecname}
-	Bob hat auf dem \code{master} branch am Beweis weitergearbeitet. \\
-	Alice ist fertig im \code{performance} branch
-	und möchte in den \code{master} mergen.
 	\begin{Beispiel}
 		\begin{commandline}
 			\cmd{git checkout} master & \\
-			\cmd{git merge} performance & \\
-			\out{Merge made by the 'ort' strategy.} \\
-			\out{~algo.py | 4 +++-} \\
-			\out{~1 file changed, 3 insertions(+), 1 deletion(-)} \\
+			\uncover<2>{\cmd{git merge} performance & }
 		\end{commandline}
-		\only<1>{\center{} {\huge \alert{Grafik: zustand}}}
-		\only<2>{\center{} {\huge \alert{Grafik: ergebnis}}}
 	\end{Beispiel}
+	\center
+	\begin{figure}
+		\only<1>{\includegraphics{../grafiken/ex3-graph-premerge}}
+		\only<2>{\includegraphics{../grafiken/ex3-graph}}
+	\end{figure}
 \end{frame}
 
 %