mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
d0078bf05c
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. |
||
|---|---|---|
| .. | ||
| find_conflicts.go | ||
| find_conflicts_test.go | ||
| merge_conflict.go | ||
| rendering.go | ||
| state.go | ||
| state_test.go | ||