mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
The patch contains changes to two files; the first one conflicts, the second doesn't. Note how it only applies changes to the first file at this point in the branch; we'll fix this in the next commit. This test would fail on master for multiple reasons.