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

edit line 1
---

diff --git a/test1.txt b/test1.txt
index 946e7b9..f4be4fd 100644
--- a/test1.txt
+++ b/test1.txt
@@ -1,4 +1,4 @@
-This will be my test file. User2 has added some text. User2 add some more text. USER1 non-conflict edit. 
+This will be my test file. User2 has added some text. User2 add some more text. USER1 non-conflict edit. USER1 edit again.
 
 The second line USER2 ADDED TEXT will be the one that should trigger a conflict.