From 217800c83aa4d31ace791903c806c6fabb61297d Mon Sep 17 00:00:00 2001 From: leo Date: Tue, 9 Apr 2024 15:36:11 +0800 Subject: [PATCH] feature: support Meld as an external merge tool on Linux platform --- src/Models/ExternalMerger.cs | 1 + src/Resources/ExternalToolIcons/meld.png | Bin 0 -> 3471 bytes 2 files changed, 1 insertion(+) create mode 100644 src/Resources/ExternalToolIcons/meld.png diff --git a/src/Models/ExternalMerger.cs b/src/Models/ExternalMerger.cs index 12655df1..773a7f94 100644 --- a/src/Models/ExternalMerger.cs +++ b/src/Models/ExternalMerger.cs @@ -61,6 +61,7 @@ namespace SourceGit.Models new ExternalMerger(2, "vscode_insiders", "Visual Studio Code - Insiders", "/usr/share/code-insiders/code-insiders", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(3, "kdiff3", "KDiff3", "/usr/bin/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), new ExternalMerger(4, "beyond_compare", "Beyond Compare", "/usr/bin/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), + new ExternalMerger(5, "meld", "Meld", "/usr/bin/meld", "\"$LOCAL\" \"$BASE\" \"$REMOTE\" -output \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), }; } else diff --git a/src/Resources/ExternalToolIcons/meld.png b/src/Resources/ExternalToolIcons/meld.png new file mode 100644 index 0000000000000000000000000000000000000000..8c41d9a71b16be98fa4b1c39fa88fe9a3ea47480 GIT binary patch literal 3471 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