diff --git a/src/git-test.txt b/src/git-test.txt index a98ccd9..d35b7c9 100644 --- a/src/git-test.txt +++ b/src/git-test.txt @@ -1,4 +1,4 @@ Test file to see whether it works. Wow. New line. -And a conflict should start here. +And a better conflict should start here.