From 7f8f1622a0ca6aca9edf5c639740d597f0534819 Mon Sep 17 00:00:00 2001
From: Kenny Ballou <kballou@devnulllabs.io>
Date: Fri, 23 Mar 2018 17:09:28 -0600
Subject: add 2 parent merge, unmerged slide

---
 src/git-in-reverse.tex | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/git-in-reverse.tex b/src/git-in-reverse.tex
index fe82ac9..86ed438 100644
--- a/src/git-in-reverse.tex
+++ b/src/git-in-reverse.tex
@@ -832,6 +832,25 @@ Currently, all branches are pointing to the same commit:
 \end{figure}
 \end{frame}
 
+\begin{frame}
+\frametitle{Git± Merging}
+\framesubtitle{$2$-Parent Merge}
+\begin{figure}
+\begin{tikzpicture}
+\node (C0) at (0, 6.5) {C0};
+\node (C1) at (0, 5) {C1};
+\node (C2) at (0, 3) {C2};
+\node[text=solarizedMagenta] (C2') at (1, 3) {C2};
+\node[text=solarizedMagenta] (C3) at (1, 2) {C3};
+
+\draw[-o,thick] (C0) -- (C1);
+\draw[-o,thick] (C1) -- (C2);
+\draw[-o,thick] (C1) to[in=90,out=-90] (C2');
+\draw[-o,thick] (C2') -- (C3);
+\end{tikzpicture}
+\end{figure}
+\end{frame}
+
 \begin{frame}
 \frametitle{Git± Merging}
 \framesubtitle{$2$-Parent Merge}
-- 
cgit v1.2.1