edit line 3

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