From 8285f4800dd5c10fefbee21388923d2aad0806e8 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <andersn@control.lth.se>
Date: Wed, 20 Mar 2013 12:03:26 +0100
Subject: [PATCH] Time for lunch, shouldn't be that much left

---
 git-tutorial.tex | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/git-tutorial.tex b/git-tutorial.tex
index 9531114..0c0aec8 100644
--- a/git-tutorial.tex
+++ b/git-tutorial.tex
@@ -437,7 +437,10 @@ Resolve the conflict by editing the file and choose which version, or
 combination of them, that should be kept. In the above case it seems
 pretty obvious that the second version is just crap so we remove it as
 well as the conflict markers. Then we commit the resolved file.
-
+\begin{lstlisting}
+andersn@stodola: git commit -am"Resolved merge conflict"
+[master ee5645b] Resolved merge conflict
+\end{lstlisting}
 
 \section{Further Reading}
 \label{sec:furtherreading}
-- 
GitLab