From fcd5e1eec5f41a1ffb4cf1a087d97bac5b575c43 Mon Sep 17 00:00:00 2001 From: Wilfred Hughes Date: Sun, 10 Aug 2025 15:05:23 +0100 Subject: [PATCH] Link mergiraf in both sections discussing merging --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e2ef8369f..13d393b6f 100644 --- a/README.md +++ b/README.md @@ -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