summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-stratum-field-ordering.exit
diff options
context:
space:
mode:
Diffstat (limited to 'tests.merging/conflict-stratum-field-ordering.exit')
-rw-r--r--tests.merging/conflict-stratum-field-ordering.exit1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.exit b/tests.merging/conflict-stratum-field-ordering.exit
deleted file mode 100644
index d00491fd..00000000
--- a/tests.merging/conflict-stratum-field-ordering.exit
+++ /dev/null
@@ -1 +0,0 @@
-1