Mergiraf

Antonin Delpeuch·Mergiraf.Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.

Mergiraf can solve a wide range of Git merge conflicts. That's because it's aware of the trees in your files! Thanks to its understanding of your language, it can often reconcile the needs of both sides. You can teach Mergiraf a new language in a completely declarative way. It's a nonviolent animal, so it prefers that over imperatives.

winget install --id Mergiraf.Mergiraf --exact --source winget

Latest 0.16.3·January 26, 2026

Installer type: zip

x64F29DA2DE294DCC99982DE623A32234821681554EE6785EDFB67E20C692BD2099

Details

Homepage
https://mergiraf.org/
License
GPLv3
Publisher
Antonin Delpeuch

Older versions (10)

0.16.1
x642A0637AA85830A41DB4808C8070CA0ACE9B6F7C12D8020E72E096CD0C84EFF62
0.15.0
x64C69A498779F52EF2D0A8FFB5D0F157AE6A92EA7CD3B4BE0ACBBCB8D990F8A65D
0.14.0
x6425BDB8545AE7D719BE1CB7D4C6371ACCCA515E15CE75D69C4C3F578278182B2A
0.13.0
x644E5BEBCA81EB08F30A64C8B072E8347A23C872B495FB50E37542C16DEA277512
0.10.0
x64081F67C704D55DCE17853442DBFD9C478B9570D23ECFA089394B07514D6DACFC
0.6.0
x64A4DD34F281AF1861065059B03CA9FA3DDAC41C517DE377ACA086CBED2615F577
0.5.1
x64C990AEB409D6B2C9187BA244BB08C893B5F30B51214B31D0A5A5B97EF67376E0
0.3.1
x6463C11782036C4748BA368E7440E755088F8C2866D5D04D25F796DE1E7858D266
0.3.0
x6423EC49FD4E41C55034D22A72C0A6709A1805F7CE91EA6436A62600FB2B15F70C
0.2.0
x64B3205197942BFEC67B07B36532972196407DB26095641A61FCB1B2BF698966C0