From 40d27e89a6122599b0e7d0ee8d3320c9ed2b3361 Mon Sep 17 00:00:00 2001 From: Philippe Dosch <Philippe.Dosch@loria.fr> Date: Mon, 6 Jan 2014 20:24:21 +0100 Subject: [PATCH] Introduces skeleton of branches part --- branchmerge.tex | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/branchmerge.tex b/branchmerge.tex index 3749ab3..da5c423 100644 --- a/branchmerge.tex +++ b/branchmerge.tex @@ -17,27 +17,27 @@ %====================================================================== -\subsection{La commande \ext{merge}} +\subsection{La commande \texttt{merge}} %====================================================================== -\frame{\frametitle{} +\frame{\frametitle{Yop} \begin{itemize} \item - + Yop \end{itemize} } %====================================================================== -\subsection{La commande \ext{rebase}} +\subsection{La commande \texttt{rebase}} %====================================================================== -\frame{\frametitle{} +\frame{\frametitle{Yop} \begin{itemize} \item - + Yop \end{itemize} } -- GitLab