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=af9ad7882f4e4beb4d029e9a865288d306fd679a;p=test%2Ftestrepo.git

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

diff --git a/jezek.txt b/jezek.txt
index f9a6fd6..b672968 100644
--- a/jezek.txt
+++ b/jezek.txt
@@ -20,3 +20,5 @@ edit edit edit
 hack hack hack
 edit2
 hack2
+jezek
+jezek