lazygit/test/integration/mergeConflictUndo/expected/file3

mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-23 21:51:07 +02:00
<<<<<<< HEAD
once upon a time there was a horse
=======
once upon a time there was a mouse
>>>>>>> develop
update merge conflict undo test 2021-04-05 11:16:11 +10:00			`<<<<<<< HEAD`
add merge conflict undo integration test 2021-04-02 10:28:59 +11:00			`once upon a time there was a horse`
update merge conflict undo test 2021-04-05 11:16:11 +10:00			`=======`
			`once upon a time there was a mouse`
			`>>>>>>> develop`