From ffbef54c4f9795a9d764ff0496ae22fa82895d07 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwin.coumans@gmail.com>
Date: Fri, 6 Dec 2013 15:06:54 -0700
Subject: [PATCH] test

---
 test.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test.txt

diff --git a/test.txt b/test.txt
new file mode 100644
index 000000000..4e068786d
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+test merge