]> 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 | combined (merge: 6a99905 d04be67)
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 patch | diff1 | diff2 | blob | history

diff --cc jh_lorem.txt
Simple merge
Testovaci repozitar