lazygit/test/integration/mergeConflictUndo/expected/repo/directory/file2
2022-03-27 14:58:20 +11:00

5 lines
49 B
Text

<<<<<<< HEAD
test3
=======
test2
>>>>>>> develop