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

Link mergiraf in both sections discussing merging

pull/856/merge
Wilfred Hughes 2025-08-10 15:05:23 +07:00
parent a3bcd66de6
commit fcd5e1eec5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
Unescape Escape View File

@ -68,7 +68,9 @@ line, and it tracks the relationship between line numbers in the old
and new file.)
Merging. AST merging is a hard problem that difftastic does not
address.
address. You might be interested in the [mergiraf
tool](https://mergiraf.org/) ("merge giraffe"), which does do AST
merging.
## FAQ