Skip to content

textDiff option set to "0" should allow single letters to be merged instead of taking the default value 60. #104

@geyang

Description

@geyang

If you set textDiff: {minLength: 0}, the text diff falls back to the default minLength of 60 characters. This prevents two single letter commits to merge properly.

Setting minLength to 1 allows two strings with at least 2 characters to properly diff merge. However for changes such as:

"" => "a" and "" => "b" the merge simply takes the later one. If any further updates on a is made, it is also replaced by b.

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