Unreviewed, fix merge issue in a test.
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Dec 2015 20:28:23 +0000 (20:28 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Dec 2015 20:28:23 +0000 (20:28 +0000)
commit22adfbbd56ade88ea03e35a6925480c008090718
tree6f5ef7ac605272bff3220a3eb3bde8c3622ecff2
parenta3ad4eebd390931295ce086b604e57bc718763d0
Unreviewed, fix merge issue in a test.

* b3/testb3.cpp:
(JSC::B3::testCheckTwoMegaCombos):
(JSC::B3::testCheckTwoNonRedundantMegaCombos):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194050 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/b3/testb3.cpp