]> www.fi.muni.cz Git - test/testrepo.git/commitdiff
Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~git/testrepo
authorJuraj Hudak <xhudak@fi.muni.cz>
Thu, 7 Apr 2011 10:46:37 +0000 (12:46 +0200)
committerJuraj Hudak <xhudak@fi.muni.cz>
Thu, 7 Apr 2011 10:46:37 +0000 (12:46 +0200)
1  2 
jh_lorem.txt

diff --cc jh_lorem.txt
Simple merge