projects / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ede0555)
edit trymerge
authorSteele <gsteele@tudelft.net@tud12721.fritz.box>
Wed, 22 May 2013 20:30:49 +0000 (22:30 +0200)
committerSteele <gsteele@tudelft.net@tud12721.fritz.box>
Wed, 22 May 2013 20:30:49 +0000 (22:30 +0200)
c/c1 patch | blob | history

diff --git a/c/c1 b/c/c1
index 4a35dc5c189e4b3b0b9fa46f51a6c4080524963b..bbdb3eac824cb11c7d6bd3fac7e76fa01d85a15a 100644 (file)
--- a/c/c1
+++ b/c/c1
@@ -1 +1 @@
-this is a new test in code 2
\ No newline at end of file
+an edit in the trymerge branch
\ No newline at end of file
Unnamed repository; edit this file 'description' to name the repository.