1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-08 04:04:22 +02:00
lazygit/test/integration/mergeConflictUndo/expected/repo/file5
2022-03-27 14:58:20 +11:00

6 lines
107 B
Plaintext

<<<<<<< HEAD
once upon a time there was a horse
=======
once upon a time there was a mouse
>>>>>>> develop