diff --git a/newfile.txt b/newfile.txt --- a/newfile.txt +++ b/newfile.txt @@ -1,6 +1,6 @@ start line (to prevent rebase failures) middle line 1 - bad -middle line 2 - ??? +middle line 2 - good end line