Two branches were merged and all conflicts have been resolved

2020-01-23 13:16:35 +01:00 · 2020-01-23 13:16:35 +01:00 · 8322116f4e
commit 8322116f4e
parent dfd61d4ea3 4199cee711
3 changed files with 5 additions and 1 deletions
--- a/first.txt
+++ b/first.txt
@ -1,3 +1,5 @@
 this is the very first file
 this line was added later.
+branch hur third line
+branch hur fourth line
 This is a sentence appended in branch master.
--- a/second.txt
+++ b/second.txt
@ -1,2 +1,4 @@
 this is the second file
 This is the second line of this text file.
+and this line was added in branch hur
+this is the last line added in branch hur
--- a/third.txt
+++ b/third.txt
@ -1,2 +1,2 @@
-This is another file
+This file was changed in branch hur
 Third file second line