From c82103531902bd098045c5715bc45ac21c2f2990 Mon Sep 17 00:00:00 2001
From: Stephane Caron <stephane.caron@ens.fr>
Date: Tue, 29 May 2012 16:37:31 -0700
Subject: Sample branch figure

---
 workshop.tex | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'workshop.tex')

diff --git a/workshop.tex b/workshop.tex
index c798a16..d09f850 100644
--- a/workshop.tex
+++ b/workshop.tex
@@ -47,6 +47,10 @@
 \includegraphics[width=\textwidth]{figures/git-merge-ok.pdf}
 \end{frame}
 
+\begin{frame}
+\includegraphics[width=\textwidth]{figures/commits.pdf}
+\end{frame}
+
 \begin{frame}
 \begin{center}
 \includegraphics[scale=.9]{figures/git-merge-conflict.pdf}
-- 
cgit v1.2.3-70-g09d2

