Files
lazygit/pkg/gui
Stefan Haller d0078bf05c Recognize conflict markers that have no label
Git only writes the space after a marker when there is a label to write
after it, and the label can be empty: `git checkout -m` with the diff3
conflict style, for instance, has no name for the common ancestor, so it
writes a bare "|||||||" line.
2026-08-08 12:43:42 +02:00
..
2025-11-15 10:46:23 +01:00
2026-07-31 08:42:51 +02:00
2025-07-08 15:14:45 +02:00
2025-12-23 16:49:16 +01:00
2025-05-06 09:43:26 +02:00