commit ffbef54c4f9795a9d764ff0496ae22fa82895d07
Author: Erwin Coumans <erwin.coumans@gmail.com>
Date:   Fri Dec 6 15:06:54 2013 -0700

    test

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