From a80f660c579bccaf79c40f558a1c4d3b9ab5fba5 Mon Sep 17 00:00:00 2001
From: FrontAid CMS <56605536+frontaid@users.noreply.github.com>
Date: Tue, 27 May 2025 21:34:44 +0200
Subject: [PATCH] Add Mergiraf

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5a58b61..f6cbc23 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Feel free to contribute.
 * [git when-merged](https://github.com/mhagger/git-when-merged) - Determine when a particular commit was merged into a git branch.
 * [git-fiddle](https://github.com/felixSchl/git-fiddle) - Edit commit messages, authors, and timestamps during git-rebase.
 * [git-imerge](https://github.com/mhagger/git-imerge) - Incremental merge and rebase for Git.
+* [Mergiraf](https://codeberg.org/mergiraf/mergiraf) - Syntax-aware git merge driver for a growing collection of programming languages and file formats.
 
 ## Hooks
 * [Git Hound](https://github.com/ezekg/git-hound) - Git plugin that prevents sensitive data from being committed.