From: alexpdp7 <alex@pdp7.net>
Date: Sat, 10 May 2025 19:41:31 +0000 (+0200)
Subject: Add Mergiraf
X-Git-Url: https://xn--ix-yja.es/gitweb/?a=commitdiff_plain;h=34bfb02c698e75cdecafaf4eb457832b91669194;p=alex.git

Add Mergiraf
---

diff --git a/INTERESTING_PROJECTS.org b/INTERESTING_PROJECTS.org
index 0ab59e7..1b39e6b 100644
--- 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