From f2d4f0ee6a3dc2e00b761c95be6583073e9bb89b Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Thu, 19 Nov 2015 00:25:25 +0100 Subject: [PATCH] edit line 1 --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test1.txt b/test1.txt index 946e7b9..f4be4fd 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. USER1 non-conflict edit. +This will be my test file. User2 has added some text. User2 add some more text. USER1 non-conflict edit. USER1 edit again. The second line USER2 ADDED TEXT will be the one that should trigger a conflict. -- 2.25.1