From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Tue, 6 Dec 2011 16:17:30 +0000 (+0100)
Subject: Merge branch 'master' of ssh://akis.fi.muni.cz/~git/testrepo
X-Git-Tag: snapshot-20111206-1730
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=eb7963ba29c2bcf900f4f3a729902e71eb67b17d;hp=8bcccb02ebe92f0c661904bea5b2c581d7e1e49a;p=test%2Ftestrepo.git

Merge branch 'master' of ssh://akis.fi.muni.cz/~git/testrepo
Argumenty: .git/MERGE_MSG merge
---

diff --git a/AAA.txt b/AAA.txt
new file mode 100644
index 0000000..78c1543
--- /dev/null
+++ b/AAA.txt
@@ -0,0 +1,3 @@
+aaa
+111
+222
diff --git a/tucnakuv_adresar/tucnakuv_soubor2.txt b/tucnakuv_adresar/tucnakuv_soubor2.txt
index 05a9774..7138c40 100644
--- a/tucnakuv_adresar/tucnakuv_soubor2.txt
+++ b/tucnakuv_adresar/tucnakuv_soubor2.txt
@@ -2,3 +2,5 @@
 :-P
 :-0
 :-X
+(^o^)
+~.*