fernandolordao · fernandolordao-minc · Jun 4, 2024 · Jun 4, 2024 · Jun 4, 2024 · Jun 4, 2024
diff --git a/file2.txt b/file2.txt
@@ -1,4 +1,5 @@
 line #1
-line #2 (included in upstream) fixing this line
-line #3
+line #2 (included in upstream) fixing (included in fork) this line
+line #3 included in forked repo & mere change (included during merge conflict resolution) (new change nov29 fork)
 line #4
+line #5 included in forked repo (nov29)
diff --git a/file3_onfork.txt b/file3_onfork.txt
@@ -0,0 +1,2 @@
+line #1
+line #2
diff --git a/file4.txt b/file4.txt
@@ -1,3 +1,4 @@
 line #1
-line #2
+line #2 just change
 line #3
+line #4