From e04ad99b99281bc02c5f891f27cbbbf7e14a903a Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Wed, 18 Nov 2015 23:44:06 +0100 Subject: [PATCH] user2 added some text --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test1.txt b/test1.txt index 662db96..1a3d7fc 100644 --- a/test1.txt +++ b/test1.txt @@ -1,4 +1,4 @@ -This will be my test file +This will be my test file. User2 has added some text. The second line will be the one that should trigger a conflict. -- 2.25.1