- Bla.

2007-05-12 06:13:59 +00:00
parent d122ae95fe
commit 4c06d50747
1 changed files with 2 additions and 2 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.