X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=file2.txt;h=9c36491379cf401b31d2203122bf02f321d50525;hb=HEAD;hp=20d5b672a347112783818b3fc8cc7cd66ade3008;hpb=b05fa3cf2a09cc6e27b14bed2c0403282ceba64d;p=test.git

diff --git a/file2.txt b/file2.txt
index 20d5b67..9c36491 100644
--- a/file2.txt
+++ b/file2.txt
@@ -1 +1,7 @@
-Second file
+<<<<<<< e73427bfbfa58797dc64a37c36a6cc025482eb38
+Second file :-)
+>>>>>>> my changes on master
+With a new line
+other line
+
+other line