test
authorSteele <gsteele@tudelft.net@tud12721.fritz.box>
Wed, 22 May 2013 21:08:55 +0000 (23:08 +0200)
committerSteele <gsteele@tudelft.net@tud12721.fritz.box>
Wed, 22 May 2013 21:08:55 +0000 (23:08 +0200)
1  2 
c/c1

diff --cc c/c1
index 0676390d580240ac56e08bbb79f257f7bf7a7182,876f246e01937e131cf37fe875bc35bbf2f1156a..5d89cb37028eef6d93386261cffea6396855d06d
--- 1/c/c1
--- 2/c/c1
+++ b/c/c1
@@@ -1,1 -1,1 +1,2 @@@
- more edit in copy
 -edit in code1
++more edit in copy
++