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

..

find_conflicts_test.go

Recognize conflict markers that have no label

2026-08-08 12:43:42 +02:00

find_conflicts.go

Recognize conflict markers that have no label

2026-08-08 12:43:42 +02:00

merge_conflict.go

Pick both hunks, not the common ancestor, in diff3 conflicts

2026-07-01 09:57:26 +02:00

rendering.go

Fix linter warning about inefficient string concatenation

2026-05-03 16:39:41 +02:00

state_test.go

Make the conflict marker size a parameter of our marker matching

2026-08-08 12:43:42 +02:00

state.go

Make the conflict marker size a parameter of our marker matching

2026-08-08 12:43:42 +02:00