]> 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: 5da6b68 b71bbda)
WIP on master: 5da6b68 ddd do aaa snapshot-20120124-1415
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:15:05 +0000 (14:15 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:15:05 +0000 (14:15 +0100)
1  2 
zizala.txt patch | diff1 | diff2 | blob | history

diff --cc zizala.txt
index fc124382e86e6afa2c952366f8c94ef6c085380a,fc124382e86e6afa2c952366f8c94ef6c085380a..86215663495abd0d28a918db44efe0c835950790
--- 1/zizala.txt
--- 2/zizala.txt
+++ b/zizala.txt
@@@ -1,3 -1,3 +1,4 @@@
++roura
  trubka
  zizala
  zizala
Testovaci repozitar