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

edit in trymerge
---

diff --git a/c/c1 b/c/c1
index bbdb3ea..105c963 100644
--- a/c/c1
+++ b/c/c1
@@ -1 +1 @@
-an edit in the trymerge branch
\ No newline at end of file
+edit in trymerge
\ No newline at end of file