mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve merge conflict flow

Browse source
This commit is contained in:
Jesse Duffield 2022-01-26 01:20:19 +11:00
parent ce3bcfe37c
commit c8cc18920f
17 changed files with 396 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/integration/mergeConflicts/config/config.yml Normal file
View file

@ -0,0 +1,5 @@
disableStartupPopups: true
gui:
showFileTree: false
refresher:
refreshInterval: 1