v0.2.53..v0.2.54 changeset NetworkConflateCmdInputReverseTest.sh

diff --git a/test-files/cmd/glacial/NetworkConflateCmdInputReverseTest.sh b/test-files/cmd/glacial/NetworkConflateCmdInputReverseTest.sh
index 094c955..f9c43af 100755
--- a/test-files/cmd/glacial/NetworkConflateCmdInputReverseTest.sh
+++ b/test-files/cmd/glacial/NetworkConflateCmdInputReverseTest.sh
@@ -6,11 +6,11 @@ mkdir -p test-output/cmd/glacial/NetworkConflateCmdInputReverseTest
 
 # Let's see if we can conflate the other way, since that wasn't working at one point.
 # The output is different, which is a little disturbing, but we'll deal with that later.
-hoot conflate -C Testing.conf --warn -C ReferenceConflation.conf -C NetworkAlgorithm.conf \
+hoot conflate --warn -C ReferenceConflation.conf -C NetworkAlgorithm.conf -C Testing.conf \
  test-files/DcTigerRoads.osm test-files/DcGisRoads.osm \
  test-output/cmd/glacial/NetworkConflateCmdInputReverseTest/output.osm
 
-hoot diff test-output/cmd/glacial/NetworkConflateCmdInputReverseTest/output.osm \
+hoot diff -C Testing.conf test-output/cmd/glacial/NetworkConflateCmdInputReverseTest/output.osm \
           test-files/cmd/glacial/NetworkConflateCmdInputReverseTest/output.osm || \
      diff test-output/cmd/glacial/NetworkConflateCmdInputReverseTest/output.osm \
           test-files/cmd/glacial/NetworkConflateCmdInputReverseTest/output.osm