test: Make sure the naive node conflict scanner is ok

npm · May 24, 2018 · 98ffe4a · 98ffe4a
1 parent a8d89d9
commit 98ffe4a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/test/tap/shrinkwrap-resolve-conflict.js b/test/tap/shrinkwrap-resolve-conflict.js
@@ -36,17 +36,17 @@ test('conflicts in shrinkwrap are auto-resolved on install', (t) => {
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-<<<<<<< HEAD
+<<` + `<<` + `<<` + `< HEAD
     "modA": {
       "version": "file:modA"
-||||||| merged common ancestors
+||` + `||` + `||` + `| merged common ancestors
     "modB": {
       "version": "file:modB"
-=======
+==` + `==` + `==` + `=
     "modC": {
       "version": "file:modC",
       "dev": true
->>>>>>> branch
+>>` + `>>` + `>>` + `> branch
     }
   }
 }