go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-24 05:36:19 +02:00
Code Issues Releases Activity
lazygit/test/integration/mergeConflicts/expected/file
Jesse Duffield 1abb3cd566 more thorough merge conflict integration test
2021-04-02 11:09:12 +11:00

2 lines
27 B
Plaintext
Raw Blame History

new2\noriginal2\noriginal3
Reference in New Issue View Git Blame Copy Permalink