Skip to content

d2o and d3o only work on a single line and do not remove conflict markers #2436

@sabbbin

Description

@sabbbin

When using d2o or d3o in Gvdiffsplit for resolving merge conflicts, these commands only apply to the current line, rather than the full conflict block. Additionally, they do not remove the conflict markers (<<<<<<< HEAD, =======, >>>>>>> branch) after applying the change.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions