https://www.fi.muni.cz/~kas/git / test / testrepo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e57b9b0)
Test na rozkopirovani
authorDaniel Jakubik <xjakubik@akis.fi.muni.cz>
Wed, 6 Apr 2011 14:19:01 +0000 (16:19 +0200)
committerDaniel Jakubik <xjakubik@akis.fi.muni.cz>
Wed, 6 Apr 2011 14:19:01 +0000 (16:19 +0200)
lorem_ipsum.txt patch | blob | history

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index f8943aa1c46d462caa373c33fc195cdd059b9855..bd2968c57bfe6b7902230f92077e3d66c232684d 100644 (file)
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,3 +1,5 @@
+ds;kaf;slkdf;ask;falskf;dkas
+
 YYY
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.
Testovaci repozitar