Skip to content

Commit

Permalink
Mention mergiraf
Browse files Browse the repository at this point in the history
  • Loading branch information
Wilfred committed Nov 26, 2024
1 parent 00f6959 commit 45e5cd8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ AST diffing is a lossy process from the perspective of a text
diff. Difftastic will ignore whitespace that isn't syntactically
significant, but merging requires tracking whitespace.

The [mergiraf](https://mergiraf.org/) tool does offer merges based on
a tree-sitter AST however.

### Can difftastic ignore reordering?

No. Difftastic always considers order to be important, so diffing
Expand Down

0 comments on commit 45e5cd8

Please sign in to comment.