merge: let _resolvetrivial() work on the file->action dict
By moving the conversion from the file->action dict after
_resolvetrivial(), we greatly simplify and clarify that method.
Testing that hghave does not crash when checking features $ "$TESTDIR/hghave" --test-features 2>/dev/null