From: Gary Macbook <gsteele13@gmail.com>
Date: Wed, 18 Nov 2015 22:49:29 +0000 (+0100)
Subject: adding more text
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=9e70f11aaf3a9e8db1b3e15aaed0cb13f41073dd;p=test.git

adding more text
---

diff --git a/test1.txt b/test1.txt
index 1a3d7fc..a23c3ed 100644
--- a/test1.txt
+++ b/test1.txt
@@ -1,4 +1,4 @@
-This will be my test file. User2 has added some text. 
+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.