diff --git a/git-tutorial.tex b/git-tutorial.tex
index 95311146865c7707cdf3e71ba54bdb300eaa6693..0c0aec855c06db718635159940ea3bb9e3e3fc51 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}