]> 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 (from parent 1: 394e48e)
Merge branch 'sdilena_vetev' master snapshot-20120124-1430
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:19:12 +0000 (14:19 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:19:12 +0000 (14:19 +0100)
Argumenty: .git/MERGE_MSG merge

jezek.txt patch | blob | history

diff --git a/jezek.txt b/jezek.txt
index b6729682a78829109fa6af9ea04b9f624ed7a22a..123c1ba761e03fc73663709239ffcdec533614c5 100644 (file)
--- a/jezek.txt
+++ b/jezek.txt
@@ -1,3 +1,4 @@
+jezecek
 #matko pridava sem 
 toto som sem pridal do vyvoja
 #koniec
@@ -22,3 +23,4 @@ edit2
 hack2
 jezek
 jezek
+jezek
Testovaci repozitar