From: Steele <gsteele@tudelft.net@tud12721.fritz.box>
Date: Wed, 22 May 2013 20:30:49 +0000 (+0200)
Subject: edit trymerge
X-Git-Url: https://nsweb.tn.tudelft.nl/gitweb/?a=commitdiff_plain;h=f67c747f6fea986278e42da2383610e7f31a821b;p=test.git

edit trymerge
---

diff --git a/c/c1 b/c/c1
index 4a35dc5..bbdb3ea 100644
--- 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