]> 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: 54678d0)
Konfliktni zmena
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 14 Apr 2011 14:21:32 +0000 (16:21 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 14 Apr 2011 14:21:32 +0000 (16:21 +0200)
subdir/soubor_v_podadresari patch | blob | history

diff --git a/subdir/soubor_v_podadresari b/subdir/soubor_v_podadresari
index 9c5b182695de8c6bc7977e1a431387a7852aefc0..8ba676a6f7a83b1bfe9fe58f262c3a44bf965a52 100644 (file)
--- a/subdir/soubor_v_podadresari
+++ b/subdir/soubor_v_podadresari
@@ -1,3 +1 @@
-Nejaky soubor
-neco
-neco
+krtek
Testovaci repozitar