Cristian Betivu 05a23f0e1e Discard value after END marker

2021-06-05 13:53:25 +10:00

..

find_conflicts_test.go

refactor

2021-06-02 20:33:52 +10:00

find_conflicts.go

Discard value after END marker

2021-06-05 13:53:25 +10:00

rendering.go

refactor merge panel

2021-04-18 18:58:09 +10:00

state_test.go

More generic merge conflict detection

2021-06-05 13:53:25 +10:00

state.go

refactor

2021-06-02 20:33:52 +10:00