From 4c06d50747c0751252901e441d580d36419aea43 Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Sat, 12 May 2007 06:13:59 +0000
Subject: [PATCH] - Bla.

---
 src/git-test.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/git-test.txt b/src/git-test.txt
index 7df11a7..a98ccd9 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.