1

5b5c73ee · shangbj · 619719de · fc7250d9 · 5b5c73ee · 619719de
Commit 5b5c73ee authored Mar 15, 2020 by shangbj
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 457 deletions

merge-hook.js build/merge-hook.js +1 -1

yarn.lock yarn.lock +0 -456

No files found.
--- a/build/merge-hook.js
+++ b/build/merge-hook.js
@@ -15,7 +15,7 @@ function mergeCheck(){

    console.log('curBranch', curBranch)
    console.log('mergeBranch' ,mergeMsg)
-    // process.exit(1)
+    process.exit(1)
 }

 mergeCheck()

--- a/yarn.lock
+++ b/yarn.lock