Editorial: Fix various rebase errors

[anba]

Fixes a couple of rebase errors. Also reverts attempts to address review feedback ("pattern" instead of "format" for some records), because the changes were largely unfinished and actually using "pattern" would result in equally confusing code like pattern.[[pattern]] which doesn't seem like an improvement when compared to format.[[pattern]]. For example see FormatDateTimePattern, which has format and pattern arguments.

Fixes #899.

[anba]

(https://github.com/tc39/proposal-temporal/pull/2904 depends on these change. This is mentioned in the commit messages for the other PR, but not in the description, so explicitly mention it here so that GH can create cross-reference links.)