22

b8227978 · shangbj · 0c4d9403 · b8227978 · b8227978 · b8227978
Commit b8227978 authored Mar 15, 2020 by shangbj
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

app.js app.js +1 -3

commit.js build/commit.js +1 -1

test.js test.js +1 -1

No files found.
--- a/app.js
+++ b/app.js
 console.log('app11.js11');
-<<<<<<< HEAD
-
-=====
+222
\ No newline at end of file
--- a/build/commit.js
+++ b/build/commit.js
 const execSync = require('child_process').execSync

 // git 对所有冲突的地方都会生成下面这种格式的信息，所以写个检测冲突文件的正则
-const isConflictRegular = "<<<<<<< HEAD\s"
+const isConflictRegular = "^<<<<<<<\\s|^=======$|^>>>>>>>\\s"

 let results


--- a/test.js
+++ b/test.js
-<<<<<<< HEAD
\ No newline at end of file
+11
\ No newline at end of file