utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 15:46:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
jesseduffield.lazygit/pkg/integration/tests/shared
History
Stefan Haller c3450f9406 Add tests demonstrating that we ignore the conflict-marker-size gitattribute 
When a file's conflict markers aren't seven characters long we don't
recognize them at all. Two things go wrong: we consider the file's
conflicts resolved, so we stage it and offer to continue the merge a
moment after stopping at it; and pressing enter on it shows its diff
instead of the merge conflicts view, leaving no way to resolve it in
lazygit.
2026-08-08 12:43:42 +02:00
..
conflicts.go Add tests demonstrating that we ignore the conflict-marker-size gitattribute 2026-08-08 12:43:42 +02:00
README.md add integration tests for cherry picking 2022-09-16 22:15:16 -07:00

README.md

This package contains shared helper functions for tests. It is not intended to contain any actual tests itself.