From: Gary Macbook Date: Wed, 18 Nov 2015 23:20:06 +0000 (+0100) Subject: a conflict that should auto-solve X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=b2117fbf1be6085c4bbefa69192849c62b3ed0e7;p=test.git a conflict that should auto-solve --- diff --git a/test1.txt b/test1.txt index c14422e..ff328ba 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. +The thrid line will remain unchanged. USER2 non-conflict text