pkgng/pkgng 6c04012tests/frontend conflicts.sh

Catch another package created from the wrong file copypasta.

Add the full output of what the upgrade does to match it so we are
sure we are removing, installing and upgrading the right things.
DeltaFile
+33-2tests/frontend/conflicts.sh
+33-21 files

UnifiedSplitRaw