]> git.defcon.no Git - test-repo/commitdiff
git.defcon.no / test-repo / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 704fcbb 28f79c4)
Merge http://git.defcon.no/test-repo
authorJon Langseth <jon.langseth@lilug.no>
Thu, 2 Dec 2010 19:55:57 +0000 (20:55 +0100)
committerJon Langseth <jon.langseth@lilug.no>
Thu, 2 Dec 2010 19:55:57 +0000 (20:55 +0100)
Conflicts:
fil

1  2 
fil patch | diff1 | diff2 | blob | history

diff --cc fil
index cf4fac73a95c7c77d28b07ad834fc9e2a9b748c6,1bb6ea0a427dc4320ea33a38dd4a3f58a037bac5..7a8f457f61ac767bf258c626e52ddcb2258ff1df
--- 1/fil
--- 2/fil
+++ b/fil
@@@ -1,2 -1,2 +1,3 @@@
  Hey
 +FIL!
+ Traralalalol
A simple testing space for documentation purposes.