From 666275c747da8d0a57dd53a5ffc4850137d7a97d Mon Sep 17 00:00:00 2001 From: broknecho Date: Sat, 3 May 2025 21:24:11 -0600 Subject: [PATCH] feature: add `Meld` as an option for external merge tool on Windows (#1275) --- src/Models/ExternalMerger.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Models/ExternalMerger.cs b/src/Models/ExternalMerger.cs index d97d3933..fe67ad6a 100644 --- a/src/Models/ExternalMerger.cs +++ b/src/Models/ExternalMerger.cs @@ -43,6 +43,7 @@ namespace SourceGit.Models new ExternalMerger(8, "codium", "VSCodium", "VSCodium.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(9, "p4merge", "P4Merge", "p4merge.exe", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(10, "plastic_merge", "Plastic SCM", "mergetool.exe", "-s=\"$REMOTE\" -b=\"$BASE\" -d=\"$LOCAL\" -r=\"$MERGED\" --automatic", "-s=\"$LOCAL\" -d=\"$REMOTE\""), + new ExternalMerger(11, "meld", "Meld", "Meld.exe", "\"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), }; } else if (OperatingSystem.IsMacOS())