From: Gary Macbook <gsteele13@gmail.com>
Date: Wed, 18 Nov 2015 22:21:52 +0000 (+0100)
Subject: Adding first test file
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=cb7bbf58ccf08a47ce2b0123e24b080190caf539;p=test.git

Adding first test file
---

diff --git a/test1.txt b/test1.txt
new file mode 100644
index 0000000..662db96
--- /dev/null
+++ b/test1.txt
@@ -0,0 +1,5 @@
+This will be my test file
+
+The second line will be the one that should trigger a conflict.
+
+The thrid line will remain unchanged.