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

diff --cc c/c1
index 18e11f43d8af9dac691b1e34db0aef59f6b26ead,105c9639f55183cc1814320755c0aeef4ae0b41d..6fa31de77541362d7a71b5eab4942de20a8f369e
--- 1/c/c1
--- 2/c/c1
+++ b/c/c1
@@@ -1,1 -1,1 +1,1 @@@
- edit in master
 -edit in trymerge
++edit in code1
Unnamed repository; edit this file 'description' to name the repository.