diff --git a/tutorial-6/rebase.txt b/tutorial-6/rebase.txt index 0bfb9631b0ef8bd7f0da8a96dc85862c1935e824..39c5ae1bba8f308afa3b59d43d20925151b9212f 100644 --- a/tutorial-6/rebase.txt +++ b/tutorial-6/rebase.txt @@ -1,3 +1,9 @@ + this is text from branch rebase-1 -1234567890 \ No newline at end of file +1234567890 + +this is text from branch rebase-2 + +abcdefghijklm +>>>>>>> 1d0f740 (add rebase file on rebase-2)