diff --git a/file2.txt b/file2.txt index e3d1302..0d01feb 100644 --- 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 new file mode 100644 index 0000000..df8a189 --- /dev/null +++ b/file3_onfork.txt @@ -0,0 +1,2 @@ +line #1 +line #2 \ No newline at end of file diff --git a/file4.txt b/file4.txt index dbb4963..c467bca 100644 --- a/file4.txt +++ b/file4.txt @@ -1,3 +1,4 @@ line #1 -line #2 +line #2 just change line #3 +line #4 \ No newline at end of file