Test5 p2

blocks/test.js

@@ -1,24 +1,32 @@
 // This file is to keep the test functions
 
 function createdWithMergeAndNotChangedAfter() {
     console.log('This creates the function on test branch')
     console.log('Second change on test branch')
 }
 
 function CreatedOnMainAndNotChangedAfterMerge() {
     console.log('This creates the function on main branch')
     console.log('First change on test branch')
     console.log('Second change on test branch')
 }
 
 function createdWithMergeAndChangedAfterMerge() {
     console.log('This creates the function on test branch')
     console.log('second change on test branch')
     console.log('Changed on main branch')
 }
 
 function createdOnMainAndChangedAfterWithMerge() {
     console.log('This creates the function on main branch')
     console.log('First change on test branch')
     console.log('Second change on test branch')
+    console.log('Changed on main branch')
+}
+
+function test_changedAfterMergeWithMerge() {
+    console.log('This creates the function')
+    console.log('Second change on test branch')
+    console.log('Changed again on another branch')
+    console.log('Changed second time on another branch')
 }