From: Gary Macbook <gsteele13@gmail.com>
Date: Wed, 18 Nov 2015 23:11:55 +0000 (+0100)
Subject: a conflict that should be auto fixable
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=3cc8700add50729a2033b85f4c380b2d85787684;p=test.git

a conflict that should be auto fixable
---

diff --git a/test1.txt b/test1.txt
index c14422e..d864e69 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.
+This will be my test file. User2 has added some text. User2 add some more text. USER1 non-conflict edit. 
 
 The second line USER2 ADDED TEXT will be the one that should trigger a conflict.