From: Jan "Yenya" Kasprzak 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/?p=test%2Ftestrepo.git;a=commitdiff_plain;h=eb7963ba29c2bcf900f4f3a729902e71eb67b17d Merge branch 'master' of ssh://akis.fi.muni.cz/~git/testrepo Argumenty: .git/MERGE_MSG merge --- eb7963ba29c2bcf900f4f3a729902e71eb67b17d