sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-26 16:03:10 +03:00
Code Activity
Files
4c71c26593e76e34bafcb7df717e53204b522da5
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
View Git Blame Copy Permalink