edit line 1

diff --git a/test1.txt b/test1.txt
index 946e7b9321eede5425e44bfeab7eed8193c1ab8b..f4be4fd65b2a666a91b39c4ec084435d8e692fbe 100644 (file)
--- 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.