From 1a27b1dfb1b2552a03e9a4848a996277bbc515a7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 19 Feb 2024 16:05:00 +0800
Subject: [PATCH] feature<ExternalMergeTools>: add supported external merge
 tool for macOS

---
 src/Models/ExternalMergeTools.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Models/ExternalMergeTools.cs b/src/Models/ExternalMergeTools.cs
index 0df275e0..5fb4300b 100644
--- a/src/Models/ExternalMergeTools.cs
+++ b/src/Models/ExternalMergeTools.cs
@@ -22,6 +22,14 @@ namespace SourceGit.Models {
                     new ExternalMergeTools(5, "Beyond Compare 4", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMergeTools(6, "WinMerge", "WinMergeU.exe", "-u -e \"$REMOTE\" \"$LOCAL\" \"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\""),
                 };
+            } else if (OperatingSystem.IsMacOS()) {
+                Supported = new List<ExternalMergeTools>() {
+                    new ExternalMergeTools(0, "Custom", "", "", ""),
+                    new ExternalMergeTools(1, "FileMerge", "/usr/bin/opendiff", "\"$BASE\" \"$LOCAL\" \"$REMOTE\" -ancestor \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMergeTools(2, "Visual Studio Code", "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMergeTools(3, "KDiff3", "/Applications/kdiff3.app/Contents/MacOS/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMergeTools(4, "Beyond Compare 4", "/Applications/Beyond Compare.app/Contents/MacOS/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
+                };
             }
         }