Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
test: Make sure the naive node conflict scanner is ok
  • Loading branch information
iarna committed May 24, 2018
1 parent a8d89d9 commit 98ffe4adb55a6f4459271856de2e27e95ee63375
Showing with 4 additions and 4 deletions.
  1. +4 −4 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
}
}
}

0 comments on commit 98ffe4a

Please sign in to comment.