]> www.fi.muni.cz Git - test/testrepo.git/commitdiff
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: 842c984)
Zkousim konflikt.
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Wed, 6 Apr 2011 12:18:26 +0000 (14:18 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Wed, 6 Apr 2011 12:18:26 +0000 (14:18 +0200)
lorem_ipsum.txt patch | blob | history

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 5c685e48678afad3269b9c1dc8d78ce7e15065f0..f8943aa1c46d462caa373c33fc195cdd059b9855 100644 (file)
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,3 +1,4 @@
+YYY
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.
 
Testovaci repozitar