]> 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: a863a8c 9b2d0f1)
WIP on jezek: a863a8c dalsi zizala snapshot-20110825-1615
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 25 Aug 2011 14:15:05 +0000 (16:15 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 25 Aug 2011 14:15:05 +0000 (16:15 +0200)
1  2 
zizala.txt patch | diff1 | diff2 | blob | history

diff --cc zizala.txt
index 4ca0135f3e71c74aa4ef5987c351786fabacb91f,4ca0135f3e71c74aa4ef5987c351786fabacb91f..863c2ae7188c303b4a2269aba1c6a13fd68ec7f2
--- 1/zizala.txt
--- 2/zizala.txt
+++ b/zizala.txt
@@@ -1,3 -1,3 +1,4 @@@
++zizalka
  trubka
  zizala
  zizala
Testovaci repozitar