Blame tests/resources/mergedrepo/conflicts-two.txt
|
Packit Service |
20376f |
<<<<<<< HEAD
|
|
Packit Service |
20376f |
This is without question another conflict!
|
|
Packit Service |
20376f |
=======
|
|
Packit Service |
20376f |
This is another conflict!!!
|
|
Packit Service |
20376f |
>>>>>>> branch
|