From: Daniel Jakubik <xjakubik@akis.fi.muni.cz>
Date: Wed, 6 Apr 2011 14:20:55 +0000 (+0200)
Subject: Test
X-Git-Tag: snapshot-20110506-0930~60^2~2^2~1
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=e3de86e11a0157c861248de62f4e48d06c7585ed;p=test%2Ftestrepo.git

Test
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index bd2968c..5c685e4 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,6 +1,3 @@
-ds;kaf;slkdf;ask;falskf;dkas
-
-YYY
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.