Skip to content

Support for the histogram diff algorithm #32

@wetneb

Description

@wetneb

In Git, the default diff algorithm used when merging is not the Myers algorithm implemented here, but the so-called histogram algorithm, which can significantly improve the quality of merges.

To see an example where the diff algorithm makes a difference to the merged output, see for instance the test cases in this PR, which shows a case where using Myers creates various conflicts, while using histogram merges cleanly.

I wonder if implementing the histogram algorithm (in addition to Myers) would be in scope for this library?

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