# Conflicts:
#	test/language/statements/class/classelementname-abrupt-completion.js
#	test/language/statements/class/fielddefinition-initializer-abrupt-completion.js
#	test/language/statements/class/super-fielddefinition-initializer-abrupt-completion.js

# Conflicts:
#	src/class-fields/default/cls-decl-after-same-line-async-gen.template
#	src/class-fields/default/cls-decl-after-same-line-async-method.template
#	src/class-fields/default/cls-decl-after-same-line-gen.template
#	src/class-fields/default/cls-decl-after-same-line-method.template
#	src/class-fields/default/cls-decl-after-same-line-static-async-gen.template
#	src/class-fields/default/cls-decl-after-same-line-static-async-method.template
#	src/class-fields/default/cls-decl-after-same-line-static-gen.template
#	src/class-fields/default/cls-decl-after-same-line-static-method.template
#	src/class-fields/default/cls-decl-multiple-definitions.template
#	src/class-fields/default/cls-decl-multiple-stacked-definitions.template
#	src/class-fields/default/cls-decl-new-no-sc-line-method.template
#	src/class-fields/default/cls-decl-new-sc-line-generator.template
#	src/class-fields/default/cls-decl-new-sc-line-method.template
#	src/class-fields/default/cls-decl-regular-definitions.template
#	src/class-fields/default/cls-decl-same-line-generator.template
#	src/class-fields/default/cls-decl-same-line-method.template
#	src/class-fields/default/cls-decl-wrapped-in-sc.template
#	src/class-fields/default/cls-expr-after-same-line-async-gen.template
#	src/class-fields/default/cls-expr-after-same-line-async-method.template
#	src/class-fields/default/cls-expr-after-same-line-gen.template
#	src/class-fields/default/cls-expr-after-same-line-method.template
#	src/class-fields/default/cls-expr-after-same-line-static-async-gen.template
#	src/class-fields/default/cls-expr-after-same-line-static-async-method.template
#	src/class-fields/default/cls-expr-after-same-line-static-gen.template
#	src/class-fields/default/cls-expr-after-same-line-static-method.template
#	src/class-fields/default/cls-expr-multiple-definitions.template
#	src/class-fields/default/cls-expr-multiple-stacked-definitions.template
#	src/class-fields/default/cls-expr-new-no-sc-line-method.template
#	src/class-fields/default/cls-expr-new-sc-line-generator.template
#	src/class-fields/default/cls-expr-new-sc-line-method.template
#	src/class-fields/default/cls-expr-regular-definitions.template
#	src/class-fields/default/cls-expr-same-line-generator.template
#	src/class-fields/default/cls-expr-same-line-method.template
#	src/class-fields/default/cls-expr-wrapped-in-sc.template
#	src/class-fields/private-names.case

# Conflicts:
#	src/class-fields/propname-error/cls-decl-variable-name.template
#	src/class-fields/propname-error/cls-expr-variable-name.template

# Conflicts:
#	src/class-fields/propname-constructor.case
#	src/class-fields/propname-error/cls-decl-computed-name.template
#	src/class-fields/propname-error/cls-decl-literal-name.template
#	src/class-fields/propname-error/cls-decl-string-name.template
#	src/class-fields/propname-error/cls-expr-computed-name.template
#	src/class-fields/propname-error/cls-expr-literal-name.template
#	src/class-fields/propname-error/cls-expr-string-name.template

# Conflicts:
#	src/class-fields/eval-err-contains-arguments.case
#	src/class-fields/eval-err-contains-supercall-1.case
#	src/class-fields/eval-err-contains-supercall-2.case
#	src/class-fields/eval-err-contains-supercall.case
#	src/class-fields/eval-err-contains-superproperty-1.case
#	src/class-fields/eval-err-contains-superproperty-2.case

# Conflicts:
#	src/class-fields/init-err-contains-super.case

some quick fixes for Array.prototype.{flat,flatMap} tests

Array.prototype.{flat,flatMap} property access count

[javascriptcore-test262-automation] Updated curation log with latest revision sha's from export and changed files.
    sourceRevisionAtLastExport: 3454cfdb5a targetRevisionAtLastExport: 1804b1343

[javascriptcore-test262-automation] Changes from https://github.com/webkit/webkit.git at sha 3454cfdb5a on Sat Aug 18 2018 18:11:01 GMT+0000 (Coordinated Universal Time)

$262.agent.MAX_TIME_EPSILON was intended to be used for callers like `Atomics.wait(typedArray, indexNumber, valueNumber, timeoutNumber)` where all parameters with the `Number` suffix denote values which are already Number values. It should not be used for `Atomics.wait(typedArray, indexObject, valueObject, timeoutObject)` where all parameters with the `Object` suffix denote values which are Object values, because in that case we'd require that `ToNumber(objectValue)` (potentially invoked multiple times) completes in less than 100 milliseconds (the default value for MAX_TIME_EPSILON).

Also removes $262.agent.MAX_TIME_EPSILON because it is now no longer used.

Object.fromEntries: use verifyProperty; add specification details

Intl.RelativeTimeFormat: Add some more tests for supportedLocalesOf.

Intl.RelativeTimeFormat: Fix copy/paste errors in Polish tests.

Intl.RelativeTimeFormat: Add some tests for non-object options arguments to the constructor.

Reduce time needed in RegExp tests and test fixes

[javascriptcore-test262-automation] Updated curation log with latest revision sha's from export and changed files.
    sourceRevisionAtLastExport: b69d88687a targetRevisionAtLastExport: 93b2865c

[javascriptcore-test262-automation] Changes from https://github.com/webkit/webkit.git at sha b69d88687a on Fri Aug 10 2018 18:07:39 GMT+0000 (Coordinated Universal Time)

* ms2ger/rtf-supportedLocalesOf-basic:
  Intl.RelativeTimeFormat: Add a basic test for the functionality of supportedLocalesOf().

* 'patch-1' of git://github.com/phistuck/test262:
  Added a legal part types test

Merge branch 'remove-assert.throws.early' of git://github.com/mathiasbynens/test262 into mathiasbynens-remove-assert.throws.early

* 'remove-assert.throws.early' of git://github.com/mathiasbynens/test262:
  Remove assert.throws.early

* ms2ger/rtf-unit-invalid-plausible:
  Intl.RelativeTimeFormat: Test some plausible but unsupported unit arguments.

* ms2ger/rtf-tonumber:
  Intl.RelativeTimeFormat: Add tests for ToNumber() in format/ToParts().