From: tierno Date: Mon, 22 Apr 2019 14:44:27 +0000 (+0000) Subject: change over file2 X-Git-Tag: v8.0-start~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f248ee8737e63404e4debad21307a8067c7f2dea;p=test.git change over file2 Change-Id: I7b8f0dc7fa9f5475fd135f0e13cfcc1ee24a3c8a Signed-off-by: tierno --- diff --git a/file1.txt b/file1.txt index 4625579..4e54856 100644 --- a/file1.txt +++ b/file1.txt @@ -5,4 +5,6 @@ this line was initially added to a branch and this one was contributed with a second branch and this one will be contributed (hopefully) via gerrit... but his one didn't work as expected... so here is a new attempt -Fourth attemp by Gerardo with Gerrit extension in VSCode \ No newline at end of file +Fourth attemp by Gerardo with Gerrit extension in VSCode +other line + diff --git a/file2.txt b/file2.txt index c317270..9c36491 100644 --- a/file2.txt +++ b/file2.txt @@ -1,2 +1,7 @@ -Second file +<<<<<<< e73427bfbfa58797dc64a37c36a6cc025482eb38 +Second file :-) +>>>>>>> my changes on master With a new line +other line + +other line