diff -up monotone-1.1/test/unit/tests/merge_3way.cc\~ monotone-1.1/test/unit/tests/merge_3way.cc
--- monotone-1.1/test/unit/tests/merge_3way.cc~ 2014-05-04 11:15:25.000000000 +0200
+++ monotone-1.1/test/unit/tests/merge_3way.cc 2015-01-29 02:23:06.774241679 +0100
@@ -17,6 +17,8 @@
#include "../randomfile.hh"
#include "../../../src/simplestring_xform.hh"
+#include <iostream>
+
using std::cerr;
using std::cout;
using std::stringstream;
Diff finished. Thu Jan 29 02:24:29 2015