test-repo/file.txt at 0f67fd574916531a9ff61b926c74d82cb9b360bf - test-repo - Gitea: spanski git :)

6 lines

86 B

Plaintext

Raw Blame History

 This is the first change.
 <<<<<<< HEAD
 =======
 This is the second change.
 >>>>>>> cpp