- Even better.

2007-05-12 06:31:36 +00:00
parent 4c06d50747
commit 6fb4187369
1 changed files with 1 additions and 1 deletions
--- 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.