]> 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 | patch | inline | side by side (parent: a1e792d)
konflikt
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 15 Apr 2011 07:04:15 +0000 (09:04 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 15 Apr 2011 07:04:15 +0000 (09:04 +0200)
subdir/soubor_v_podadresari patch | blob | history

diff --git a/subdir/soubor_v_podadresari b/subdir/soubor_v_podadresari
index 55c11afe3282f0a91d791b294c8fa65365f8dd5b..5819abaa15d687fdae43e43e412daaaa98485476 100644 (file)
--- a/subdir/soubor_v_podadresari
+++ b/subdir/soubor_v_podadresari
@@ -1 +1,2 @@
 jezek
+jezek
Testovaci repozitar