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