From e3cbf16f5d3ddc4ab23613e3538788fd62723845 Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Thu, 19 Nov 2015 00:25:47 +0100 Subject: [PATCH] edit line 3 --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test1.txt b/test1.txt index 946e7b9..2051be8 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. USER2 non-conflict text +The thrid line will remain unchanged. USER2 non-conflict text. USER2 edit again. -- 2.25.1