v0.2.47..v0.2.48 changeset DiffConflateCmdTest.sh.stdout

diff --git a/test-files/cmd/slow/DiffConflateCmdTest.sh.stdout b/test-files/cmd/slow/DiffConflateCmdTest.sh.stdout
index ab42a77..dff9db9 100644
--- a/test-files/cmd/slow/DiffConflateCmdTest.sh.stdout
+++ b/test-files/cmd/slow/DiffConflateCmdTest.sh.stdout
@@ -1,26 +1,31 @@
-19:01:12.599 WARN  ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
-19:01:12.599 WARN  ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
-19:01:15.310 WARN  ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
-19:01:15.310 WARN  ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
-19:01:18.027 WARN  ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
-19:01:18.027 WARN  ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
-19:01:20.718 WARN  ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
-19:01:20.718 WARN  ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
-Checking differential output
-Checking Changeset
+Running diff...
+21:15:30.759 WARN   ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
+21:15:30.759 WARN   ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
+Running diff changeset with tags...
+21:15:33.246 WARN   ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
+21:15:33.246 WARN   ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
+Running diff with tags...
+21:15:35.817 WARN   ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
+21:15:35.817 WARN   ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
+Running diff changeset with tags, separate outputs...
+21:15:38.287 WARN   ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 1 tie points were found.
+21:15:38.287 WARN   ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
+Checking differential output...
+Checking Changeset...
 Changeset Files Match
 Checking tag diff
 Tag Changeset Files Match
-Checking unified geometry+tag diff changeset
+Checking unified geometry+tag diff changeset...
 Unified Changeset Files Match
-Checking unified geometry+tag diff osm
-19:01:23.924 WARN  ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 0 tie points were found.
-19:01:23.924 WARN  ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
-19:01:24.811 INFO  ...ore/io/OsmMapReaderFactory.cpp( 174) Loading map from test-files/Empty.osm...
-19:01:24.813 INFO  .../hoot/core/io/OsmXmlReader.cpp( 347) 	Reporting missing elements...
-19:01:24.813 INFO  .../hoot/core/io/OsmXmlReader.cpp( 349) 	Reported 0 missing elements.
-19:01:24.813 INFO  ...ore/io/OsmMapReaderFactory.cpp( 206) Read 0 elements from input in: 00:00.
-19:01:24.813 INFO  ...ore/io/OsmMapReaderFactory.cpp( 174) Loading map from tmp/DiffConflateCmdTest.osm...
-19:01:24.813 INFO  .../hoot/core/io/OsmXmlReader.cpp( 347) 	Reporting missing elements...
-19:01:24.814 INFO  .../hoot/core/io/OsmXmlReader.cpp( 349) 	Reported 0 missing elements.
-19:01:24.814 INFO  ...ore/io/OsmMapReaderFactory.cpp( 206) Read 0 elements from input in: 00:00.
+Checking unified geometry+tag diff osm...
+Checking conflation of empty files...
+21:15:41.288 WARN   ...s/rubber-sheet/RubberSheet.cpp( 483) Skipping rubbersheeting due to not finding enough tie points.  The minimum allowable tie points configured is 4 and 0 tie points were found.
+21:15:41.288 WARN   ...s/rubber-sheet/RubberSheet.cpp( 159) No appropriate interpolator was specified, skipping rubber sheet transform.
+21:15:42.124 INFO   ...ore/io/OsmMapReaderFactory.cpp( 175) Loading map from ...test-files/Empty.osm...
+21:15:42.125 INFO   .../hoot/core/io/OsmXmlReader.cpp( 366) 	Reporting missing elements...
+21:15:42.125 INFO   ...ore/io/OsmMapReaderFactory.cpp( 207) Read 0 elements from input in: 00:00.
+21:15:42.125 INFO   ...ore/io/OsmMapReaderFactory.cpp( 175) Loading map from ...tmp/DiffConflateCmdTest.osm...
+21:15:42.126 INFO   .../hoot/core/io/OsmXmlReader.cpp( 366) 	Reporting missing elements...
+21:15:42.126 INFO   ...ore/io/OsmMapReaderFactory.cpp( 207) Read 0 elements from input in: 00:00.
+Checking conflation with road snapping...
+Checking conflation with road snapping and keeping ref data...