From: Gary Macbook <gsteele13@gmail.com>
Date: Wed, 18 Nov 2015 22:44:06 +0000 (+0100)
Subject: user2 added some text
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=e04ad99b99281bc02c5f891f27cbbbf7e14a903a;p=test.git

user2 added some text
---

diff --git a/test1.txt b/test1.txt
index 662db96..1a3d7fc 100644
--- a/test1.txt
+++ b/test1.txt
@@ -1,4 +1,4 @@
-This will be my test file
+This will be my test file. User2 has added some text. 
 
 The second line will be the one that should trigger a conflict.