From b2117fbf1be6085c4bbefa69192849c62b3ed0e7 Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Thu, 19 Nov 2015 00:20:06 +0100 Subject: [PATCH] a conflict that should auto-solve --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.25.1