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

edit line 3
---

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