Fix merging of sort-level record types.

[sellout]

Fixes #890.

[sellout]

The dhall-lang submodule will need to be updated once dhall-lang/dhall-lang#486 is merged.

[Gabriella439]

dhall-lang/dhall-lang#486 is merged so if you update this branch then tests should now pass

[sellout]

Looks like the largeExpression parser test now fails.

/cc @singpolyma, since they made the latest change to that test.

[f-f]

@sellout yeah it looks like there's something with that test: now both dhall-haskell master and dhall-clj master produce the same parse for it, and the result differs from the one in dhall-lang.
However dhall-lang/dhall-lang#488 will change it again, so we could wait for that (though it will require changes in dhall-haskell)

[singpolyma]

I've merged dhall-lang/dhall-lang#488 now -- not sure how the failure happened before since I produce that .dhallb file previously with dhall encode -- now the version in master is produced with dhall-ruby and should be correct for the changes in 488

[sellout]

Should this wait on #903, then?

[Gabriella439]

@sellout: Yeah, if you update to the latest master then you should pick up all relevant changes

[Gabriella439]

Thanks for fixing this! 🙂