From: Gary Macbook <gsteele13@gmail.com>
Date: Wed, 18 Nov 2015 22:53:25 +0000 (+0100)
Subject: first conflict test
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=6bf9b775fd18385db494ded584ef7258dfe4d1e8;p=test.git

first conflict test
---

diff --git a/test1.txt b/test1.txt
index a23c3ed..21e8794 100644
--- a/test1.txt
+++ b/test1.txt
@@ -1,5 +1,5 @@
 This will be my test file. User2 has added some text. User2 add some more text.
 
-The second line will be the one that should trigger a conflict.
+The second line USER1 ADDED TEXT will be the one that should trigger a conflict.
 
 The thrid line will remain unchanged.