Skip to content
This repository was archived by the owner on Aug 11, 2022. It is now read-only.

Commit 98ffe4a

Browse files
committed
test: Make sure the naive node conflict scanner is ok
1 parent a8d89d9 commit 98ffe4a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/tap/shrinkwrap-resolve-conflict.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ test('conflicts in shrinkwrap are auto-resolved on install', (t) => {
3636
"requires": true,
3737
"lockfileVersion": 1,
3838
"dependencies": {
39-
<<<<<<< HEAD
39+
<<` + `<<` + `<<` + `< HEAD
4040
"modA": {
4141
"version": "file:modA"
42-
||||||| merged common ancestors
42+
||` + `||` + `||` + `| merged common ancestors
4343
"modB": {
4444
"version": "file:modB"
45-
=======
45+
==` + `==` + `==` + `=
4646
"modC": {
4747
"version": "file:modC",
4848
"dev": true
49-
>>>>>>> branch
49+
>>` + `>>` + `>>` + `> branch
5050
}
5151
}
5252
}

0 commit comments

Comments
 (0)