From 6fb4187369e9d2e9ada662e1cbac13191d1b373e Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Sat, 12 May 2007 06:31:36 +0000
Subject: [PATCH] - Even better.

---
 src/git-test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.