projects / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77a2a9b a438f78)
fix conflict
authorSteele <gsteele@tudelft.net@tud12721.fritz.box>
Wed, 22 May 2013 20:56:52 +0000 (22:56 +0200)
committerSteele <gsteele@tudelft.net@tud12721.fritz.box>
Wed, 22 May 2013 20:56:52 +0000 (22:56 +0200)
1  2 
c/c1 patch | diff1 | diff2 | blob | history

diff --cc c/c1
index 6fa31de77541362d7a71b5eab4942de20a8f369e,90f0620857da91a980478f9ff5510e72bf06c561..876f246e01937e131cf37fe875bc35bbf2f1156a
--- 1/c/c1
--- 2/c/c1
+++ b/c/c1
@@@ -1,1 -1,1 +1,1 @@@
- edit in code1
 -edit it code_copy
++edit in code1
Unnamed repository; edit this file 'description' to name the repository.