JavaScriptBench
diff --git a/Collapse file
‎scripts/update-experimental-branches.js‎
Copy file name to clipboardExpand all lines: scripts/update-experimental-branches.js
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎scripts/update-experimental-branches.js‎
Copy file name to clipboardExpand all lines: scripts/update-experimental-branches.js
+1-1Lines changed: 1 addition & 1 deletion
@@ -84,7 +84,7 @@ async function main() {
         const mergeTree = runSequence([
             ["git", ["merge-tree", mergeBase.trim(), branch, "experimental"]]
         ]);
-        if (mergeTree.indexOf(`===${"="}===`)) { // 7 equals is the center of the merge conflict marker
+        if (mergeTree.indexOf(`===${"="}===`) >= 0) { // 7 equals is the center of the merge conflict marker
             throw new Error(`Merge conflict detected involving PR ${branch} with other experiment`);
         }
         // Merge (always producing a merge commit)