1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-31 22:22:14 +02:00

3 Commits

Author SHA1 Message Date
Jesse Duffield
fab194e923 better handling of merge conflicts 2018-07-21 17:48:27 +10:00
Jesse Duffield
61dcbb456d updating doc 2018-07-21 16:00:05 +10:00
Jesse Duffield
37d9ed6712 test script to make repo with a merge conflict 2018-07-21 15:57:54 +10:00