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

fix some things

Browse source
This commit is contained in:
Jesse Duffield 2022-01-23 14:40:28 +11:00
parent 1dd7307fde
commit a2318d75b5
30 changed files with 367 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/integration/mergeConflictsFiltered/test.json
View file

@ -1,4 +1,4 @@
{
"description": "Verify that when we get merge conflicts we filter out any non-conflicted files",
"speed": 20
"speed": 1
}