Add Mergiraf

diff --git a/INTERESTING_PROJECTS.org b/INTERESTING_PROJECTS.org
index 0ab59e7128a73086f02f8aab58fcda57b7d3464d..1b39e6b5ab2b452bd0e59e0667f6427d59ffaafb 100644 (file)
--- a/INTERESTING_PROJECTS.org
+++ b/INTERESTING_PROJECTS.org
@@ -10,6 +10,7 @@ Also keeping things in a Org mode means I can classify and add notes.
    - https://github.com/copier-org/copier/ - project templater
    - https://github.com/Skyscanner/turbolift - operating on multiple repos
    - https://github.com/sourcegraph/doctree - code browser
+   - https://mergiraf.org/ - Language-aware merge conflict solver
 *** CI/CD
   - https://github.com/earthly/earthly - Standalone build tool with containers
   - https://github.com/reviewdog/reviewdog - Error parser than can annotate GitHub pull requests