]> 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: 8bcccb0)
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

AAA.txt [new file with mode: 0644] patch | blob
tucnakuv_adresar/tucnakuv_soubor2.txt patch | blob | history

diff --git a/AAA.txt b/AAA.txt
new file mode 100644 (file)
index 0000000..78c1543
--- /dev/null
+++ b/AAA.txt
@@ -0,0 +1,3 @@
+aaa
+111
+222
diff --git a/tucnakuv_adresar/tucnakuv_soubor2.txt b/tucnakuv_adresar/tucnakuv_soubor2.txt
index 05a9774781512e667d1f832400dc7dca3e2f8196..7138c40b724e586bb7ecd103ca7c33f0dec3d759 100644 (file)
--- a/tucnakuv_adresar/tucnakuv_soubor2.txt
+++ b/tucnakuv_adresar/tucnakuv_soubor2.txt
@@ -2,3 +2,5 @@
 :-P
 :-0
 :-X
+(^o^)
+~.*
Testovaci repozitar