2021-11-14 13:56:42 +01:00
1 changed files with 7 additions and 3 deletions
--- a/file.html
+++ b/file.html
@ -5,13 +5,17 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 	
-    <title>Test</title>
+    <title>Test v3 (also new name)</title>
  </head>
  
 <body>
+  <hr>
+  <p>something new as line 1</p>

-  <p>tekst 1</p>
-  <p>tekst 2</p>
+  <p>tekst 234 - this is also changed (again), let's hope for a conflict this time</p>
+
+  <p>maybe it won't merge automatically....</p>
+  <hr>

 </body>
 </html>