summaryrefslogtreecommitdiff
path: root/tests/test-simplemerge.py.out
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-simplemerge.py.out')
-rw-r--r--tests/test-simplemerge.py.out5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/test-simplemerge.py.out b/tests/test-simplemerge.py.out
new file mode 100644
index 0000000..953572f
--- /dev/null
+++ b/tests/test-simplemerge.py.out
@@ -0,0 +1,5 @@
+....................
+----------------------------------------------------------------------
+Ran 20 tests in 0.000s
+
+OK