mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 10:15:32 -05:00
Stefan Haller
c3450f9406
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.
This package contains shared helper functions for tests. It is not intended to contain any actual tests itself.