Taking typos out one line at a time

microsoft · Jun 5, 2019 · e6fde9e · e6fde9e
1 parent 96a2505
commit e6fde9e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/update-experimental-branches.js b/scripts/update-experimental-branches.js
@@ -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)