From 45e5cd815754c367e1f6650a2cd646ab44da0c61 Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Tue, 26 Nov 2024 01:41:46 -0800 Subject: [PATCH] Mention mergiraf --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4c34fc2463..bb8e52e2d8 100644 --- a/README.md +++ b/README.md @@ -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