v0.2.54..v0.2.55 changeset CollectionRelationMergeTest.sh

diff --git a/test-files/cmd/glacial/CollectionRelationMergeTest.sh b/test-files/cmd/glacial/CollectionRelationMergeTest.sh
new file mode 100755
index 0000000..859b6da
--- /dev/null
+++ b/test-files/cmd/glacial/CollectionRelationMergeTest.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# This tests to see if collection relations (e.g. admin bounds, routes, etc.) get merged correctly during conflation.
+
+IN_DIR=test-files/cmd/glacial/CollectionRelationMergeTest
+OUT_DIR=test-output/cmd/glacial/CollectionRelationMergeTest
+mkdir -p $OUT_DIR
+
+CONFIG="--warn -C Testing.conf"
+
+hoot conflate $CONFIG -D "writer.include.debug.tags=true" -D "uuid.helper.repeatable=true" $IN_DIR/input1.osm $IN_DIR/input2.osm $OUT_DIR/output.osm
+hoot diff $CONFIG $IN_DIR/output.osm $OUT_DIR/output.osm || diff $IN_DIR/output.osm $OUT_DIR/output.osm