sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mention mergiraf

pull/735/merge
Wilfred Hughes 2024-11-26 01:41:46 +07:00
parent 00f6959a29
commit 45e5cd8157
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
Unescape Escape View File

@ -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 diff. Difftastic will ignore whitespace that isn't syntactically
significant, but merging requires tracking whitespace. 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? ### Can difftastic ignore reordering?
No. Difftastic always considers order to be important, so diffing No. Difftastic always considers order to be important, so diffing