user 1 did something not very nice, deleting all lines of the file and adding a new...

diff --git a/test1.txt b/test1.txt
index f4be4fd65b2a666a91b39c4ec084435d8e692fbe..1f180fabdaa44b815b6e610bcdca1ff552d8b784 100644 (file)
--- a/test1.txt
+++ b/test1.txt
@@ -1,5 +1 @@
-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.
-
-The thrid line will remain unchanged. USER2 non-conflict text
+User1 is going to add stuff to the file, and delete a bunch too!