From e30beedefe2af41ee8cb22289387dc5a3f559839 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <andersn@control.lth.se>
Date: Wed, 20 Mar 2013 11:34:16 +0100
Subject: [PATCH] Commit version a
---
git-tutorial.tex | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-tutorial.tex b/git-tutorial.tex
index 5bd6100..31da171 100644
--- a/git-tutorial.tex
+++ b/git-tutorial.tex
@@ -409,7 +409,9 @@ the file given as argument.
\subsubsection*{merge}
\label{merge}
-
+Sometimes it happens that merge conflicts are introduced, the most
+common occasion is when two users happen to edit the same lines of a
+file.
--
GitLab