]> 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 2: af9ad78)
Merge branch 'master' of ssh://akis.fi.muni.cz/~git/testrepo snapshot-20111206-1730
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 6 Dec 2011 16:17:30 +0000 (17:17 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 6 Dec 2011 16:17:30 +0000 (17:17 +0100)
Argumenty: .git/MERGE_MSG merge

jezek.txt patch | blob | history

diff --git a/jezek.txt b/jezek.txt
index f9a6fd6d109a89438034b1f3998b5d625768dee9..b6729682a78829109fa6af9ea04b9f624ed7a22a 100644 (file)
--- a/jezek.txt
+++ b/jezek.txt
@@ -20,3 +20,5 @@ edit edit edit
 hack hack hack
 edit2
 hack2
+jezek
+jezek
Testovaci repozitar