Commit version a

e30beede · Administrator · 106a54a1 · e30beede
Commit e30beede authored 12 years ago by Administrator
--- 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.