UNPKG
pj-nodegit
Version:
latest (0.28.2)
0.28.2
0.28.1
0.27.12
0.27.11
0.27.1
0.27.0
0.27.0-x
0.26.41
0.26.4
0.18.6
0.18.5
0.18.4
0.18.3
0.18.1
Node.js libgit2 asynchronous native bindings
nodegit.org
pj-nodegit/nodegit
pj-nodegit
/
vendor
/
libgit2
/
tests
/
resources
/
mergedrepo
/
conflicts-two.txt
6 lines
(5 loc)
•
107 B
Plain Text
View Raw
1
2
3
4
5
6
<<<<<<< HEAD
This is without question another conflict! =======
This is another conflict!!! >>>>>>> branch