Added diff tools to INSTALL.md

alshedivat · Jan 22, 2024 · 3927200 · 3927200
1 parent 65c5c8a
commit 3927200
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/INSTALL.md b/INSTALL.md
@@ -218,4 +218,5 @@ $ git rebase v0.11.0
 If you have extensively customized a previous version, it might be trickier to upgrade.
 You can still follow the steps above, but `git rebase` may result in merge conflicts that must be resolved.
 See [git rebase manual](https://help.github.com/en/github/using-git/about-git-rebase) and how to [resolve conflicts](https://help.github.com/en/github/using-git/resolving-merge-conflicts-after-a-git-rebase) for more information.
-If rebasing is too complicated, we recommend re-installing the new version of the theme from scratch and port over your content and changes from the previous version manually.
+If rebasing is too complicated, we recommend re-installing the new version of the theme from scratch and port over your content and changes from the previous version manually. You can use tools like [meld](https://meldmerge.org/)
+or [winmerge](https://winmerge.org/) to help in this process.