UNPKG
patched-git-utils
Version:
latest (4.0.8)
4.0.8
4.0.7
A package for using Git repositories
atom.github.io/git-utils
atom/git-utils
patched-git-utils
/
deps
/
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