From a97eeaee15d2b0b1de55fcfd0ff71a1bfdff8d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Tue, 17 Nov 2026 11:31:13 +0100 Subject: [PATCH 1/8] Add support for VisualDiffer --- src/DiffEngine.Tests/defaultOrder.include.md | 1 + src/DiffEngine.Tests/diffToolList.include.md | 1 + src/DiffEngine.Tests/diffTools.include.md | 31 +++++++++++++++++++ src/DiffEngine/Definitions.cs | 1 + src/DiffEngine/DiffTool.cs | 1 + src/DiffEngine/Implementation/VisualDiffer.cs | 22 +++++++++++++ 6 files changed, 57 insertions(+) create mode 100644 src/DiffEngine/Implementation/VisualDiffer.cs diff --git a/src/DiffEngine.Tests/defaultOrder.include.md b/src/DiffEngine.Tests/defaultOrder.include.md index 428aac49..65651c37 100644 --- a/src/DiffEngine.Tests/defaultOrder.include.md +++ b/src/DiffEngine.Tests/defaultOrder.include.md @@ -3,6 +3,7 @@ * **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid) * **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free) * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid) + * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Windows/OSX (Cost: Paid) * **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate) * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free) diff --git a/src/DiffEngine.Tests/diffToolList.include.md b/src/DiffEngine.Tests/diffToolList.include.md index 11391be6..aec2b1c1 100644 --- a/src/DiffEngine.Tests/diffToolList.include.md +++ b/src/DiffEngine.Tests/diffToolList.include.md @@ -22,6 +22,7 @@ * **[TortoiseIDiff](/docs/diff-tool.md#tortoiseidiff)** Windows (Cost: Free) * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free) * **[Vim](/docs/diff-tool.md#vim)** Windows/OSX (Cost: Free with option to donate) + * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options) * **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free) * **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index fc198e5e..c7c20ee3 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -1314,6 +1314,37 @@ DiffTools.UseOrder(DiffTool.SublimeMerge); * Scanned paths: * `%PATH%smerge` +### [VisualDiffer](https://visualdiffer.com) + + * Cost: Free + * Is MDI: True + * Supports auto-refresh: True + * Supports text files: True + * Use shell execute: True + * Create no window: False + * Environment variable for custom install location: `DiffEngine_VisualDiffer` + +#### Tool order: + +Use [tool order](diff-tool.order.md) to prioritise VisualDiffer over other tools. + +``` +DiffTools.UseOrder(DiffTool.VisualDiffer); +``` + +#### OSX settings: + + * Example target on left arguments: + ``` + "targetFile.txt" "tempFile.txt" + ``` + * Example target on right arguments: + ``` + "tempFile.txt" "targetFile.txt" + ``` + * Scanned paths: + * `%PATH%visdiff` + ### [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff) * Cost: Paid and free options diff --git a/src/DiffEngine/Definitions.cs b/src/DiffEngine/Definitions.cs index be0394ae..880cb043 100644 --- a/src/DiffEngine/Definitions.cs +++ b/src/DiffEngine/Definitions.cs @@ -13,6 +13,7 @@ static Definitions() => Implementation.BeyondCompare(), Implementation.P4Merge(), Implementation.Kaleidoscope(), + Implementation.VisualDiffer(), Implementation.DeltaWalker(), Implementation.WinMerge(), Implementation.TortoiseMerge(), diff --git a/src/DiffEngine/DiffTool.cs b/src/DiffEngine/DiffTool.cs index 2c556785..ead151c7 100644 --- a/src/DiffEngine/DiffTool.cs +++ b/src/DiffEngine/DiffTool.cs @@ -9,6 +9,7 @@ public enum DiffTool BeyondCompare, P4Merge, Kaleidoscope, + VisualDiffer, DeltaWalker, WinMerge, TortoiseMerge, diff --git a/src/DiffEngine/Implementation/VisualDiffer.cs b/src/DiffEngine/Implementation/VisualDiffer.cs new file mode 100644 index 00000000..30412157 --- /dev/null +++ b/src/DiffEngine/Implementation/VisualDiffer.cs @@ -0,0 +1,22 @@ +namespace DiffEngine; + +static partial class Implementation +{ + public static Definition VisualDiffer() => + new( + Tool: DiffTool.VisualDiffer, + Url: "https://visualdiffer.com", + AutoRefresh: true, + IsMdi: true, + SupportsText: true, + UseShellExecute: true, + RequiresTarget: true, + Cost: "Free", + BinaryExtensions: [], + OsSupport: new( + Osx: new( + "visdiff", + new( + Left: (temp, target) => $"\"{target}\" \"{temp}\"", + Right: (temp, target) => $"\"{temp}\" \"{target}\"")))); +} From 553e24b61db70e6da29f450e114583a810ae2b36 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 17 Nov 2026 12:46:23 +0000 Subject: [PATCH 2/8] Docs changes --- docs/diff-tool.md | 31 +++++++++++++++++++++++++++++++ docs/diff-tool.order.md | 1 + readme.md | 1 + 3 files changed, 33 insertions(+) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 50b2e5cb..266c96c1 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -1482,6 +1482,37 @@ DiffTools.UseOrder(DiffTool.SublimeMerge); * Scanned paths: * `%PATH%smerge` +### [VisualDiffer](https://visualdiffer.com) + + * Cost: Free + * Is MDI: True + * Supports auto-refresh: True + * Supports text files: True + * Use shell execute: True + * Create no window: False + * Environment variable for custom install location: `DiffEngine_VisualDiffer` + +#### Tool order: + +Use [tool order](diff-tool.order.md) to prioritise VisualDiffer over other tools. + +``` +DiffTools.UseOrder(DiffTool.VisualDiffer); +``` + +#### OSX settings: + + * Example target on left arguments: + ``` + "targetFile.txt" "tempFile.txt" + ``` + * Example target on right arguments: + ``` + "tempFile.txt" "targetFile.txt" + ``` + * Scanned paths: + * `%PATH%visdiff` + ### [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff) * Cost: Paid and free options diff --git a/docs/diff-tool.order.md b/docs/diff-tool.order.md index f2e8f2e4..0f9a9357 100644 --- a/docs/diff-tool.order.md +++ b/docs/diff-tool.order.md @@ -15,6 +15,7 @@ To change this file edit the source file and then run MarkdownSnippets. * **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid) * **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free) * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid) + * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Windows/OSX (Cost: Paid) * **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate) * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free) diff --git a/readme.md b/readme.md index 5a0f3b2c..def2340b 100644 --- a/readme.md +++ b/readme.md @@ -93,6 +93,7 @@ DiffEngine manages launching and cleanup of diff tools. It is designed to be use * **[TortoiseIDiff](/docs/diff-tool.md#tortoiseidiff)** Windows (Cost: Free) * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free) * **[Vim](/docs/diff-tool.md#vim)** Windows/OSX (Cost: Free with option to donate) + * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options) * **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free) * **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate) From 049740374c0a0e2d91bd9f29b230230ea65538a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Tue, 17 Nov 2026 23:59:49 +0100 Subject: [PATCH 3/8] Add support for Microsoft Word files and PDF files --- src/DiffEngine.Tests/diffTools.include.md | 1 + src/DiffEngine/Implementation/VisualDiffer.cs | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index c7c20ee3..9f59fc6a 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -1323,6 +1323,7 @@ DiffTools.UseOrder(DiffTool.SublimeMerge); * Use shell execute: True * Create no window: False * Environment variable for custom install location: `DiffEngine_VisualDiffer` + * Supported binaries: .doc, .docx, .pdf #### Tool order: diff --git a/src/DiffEngine/Implementation/VisualDiffer.cs b/src/DiffEngine/Implementation/VisualDiffer.cs index 30412157..35bfb11b 100644 --- a/src/DiffEngine/Implementation/VisualDiffer.cs +++ b/src/DiffEngine/Implementation/VisualDiffer.cs @@ -12,7 +12,12 @@ public static Definition VisualDiffer() => UseShellExecute: true, RequiresTarget: true, Cost: "Free", - BinaryExtensions: [], + BinaryExtensions: + [ + ".doc", + ".docx", + ".pdf" + ], OsSupport: new( Osx: new( "visdiff", From 2e393ccb3772c746ff4a2038e2e7ed513a0d9a78 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 17 Nov 2026 23:03:13 +0000 Subject: [PATCH 4/8] Docs changes --- docs/diff-tool.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 266c96c1..e45e8287 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -1491,6 +1491,7 @@ DiffTools.UseOrder(DiffTool.SublimeMerge); * Use shell execute: True * Create no window: False * Environment variable for custom install location: `DiffEngine_VisualDiffer` + * Supported binaries: .doc, .docx, .pdf #### Tool order: From 4c0e638fea52a9a51f100952a75c2df09a6cbfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Wed, 18 Nov 2026 17:20:30 +0100 Subject: [PATCH 5/8] Add search path: /Applications/VisualDiffer.app/Contents/Helpers/ --- src/DiffEngine/Implementation/VisualDiffer.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/DiffEngine/Implementation/VisualDiffer.cs b/src/DiffEngine/Implementation/VisualDiffer.cs index 35bfb11b..bb20c554 100644 --- a/src/DiffEngine/Implementation/VisualDiffer.cs +++ b/src/DiffEngine/Implementation/VisualDiffer.cs @@ -23,5 +23,6 @@ public static Definition VisualDiffer() => "visdiff", new( Left: (temp, target) => $"\"{target}\" \"{temp}\"", - Right: (temp, target) => $"\"{temp}\" \"{target}\"")))); + Right: (temp, target) => $"\"{temp}\" \"{target}\""), + "/Applications/VisualDiffer.app/Contents/Helpers/"))); } From a78f3e9e07e25df7af9cf24f534be02e45c7d575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Wed, 18 Nov 2026 17:54:01 +0100 Subject: [PATCH 6/8] Change VisualDiffer priority: after SublimeMerge --- docs/diff-tool.order.md | 2 +- src/DiffEngine.Tests/defaultOrder.include.md | 2 +- src/DiffEngine/Definitions.cs | 2 +- src/DiffEngine/DiffTool.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/diff-tool.order.md b/docs/diff-tool.order.md index 0f9a9357..612603de 100644 --- a/docs/diff-tool.order.md +++ b/docs/diff-tool.order.md @@ -57,5 +57,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o ```cs DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge); ``` -snippet source | anchor +snippet source | anchor diff --git a/src/DiffEngine.Tests/defaultOrder.include.md b/src/DiffEngine.Tests/defaultOrder.include.md index 65651c37..b166a2e5 100644 --- a/src/DiffEngine.Tests/defaultOrder.include.md +++ b/src/DiffEngine.Tests/defaultOrder.include.md @@ -3,7 +3,6 @@ * **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid) * **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free) * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid) - * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Windows/OSX (Cost: Paid) * **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate) * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free) @@ -21,6 +20,7 @@ * **[AraxisMerge](/docs/diff-tool.md#araxismerge)** Windows/OSX (Cost: Paid) * **[Meld](/docs/diff-tool.md#meld)** Windows/OSX/Linux (Cost: Free) * **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Windows/OSX/Linux (Cost: Paid) + * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[CodeCompare](/docs/diff-tool.md#codecompare)** Windows (Cost: Free and Paid) * **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free) * **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options) diff --git a/src/DiffEngine/Definitions.cs b/src/DiffEngine/Definitions.cs index 880cb043..6152b398 100644 --- a/src/DiffEngine/Definitions.cs +++ b/src/DiffEngine/Definitions.cs @@ -13,7 +13,6 @@ static Definitions() => Implementation.BeyondCompare(), Implementation.P4Merge(), Implementation.Kaleidoscope(), - Implementation.VisualDiffer(), Implementation.DeltaWalker(), Implementation.WinMerge(), Implementation.TortoiseMerge(), @@ -31,6 +30,7 @@ static Definitions() => Implementation.AraxisMerge(), Implementation.Meld(), Implementation.SublimeMerge(), + Implementation.VisualDiffer(), Implementation.CodeCompare(), Implementation.VisualStudioCode(), Implementation.VisualStudio(), diff --git a/src/DiffEngine/DiffTool.cs b/src/DiffEngine/DiffTool.cs index ead151c7..d8521f26 100644 --- a/src/DiffEngine/DiffTool.cs +++ b/src/DiffEngine/DiffTool.cs @@ -9,7 +9,6 @@ public enum DiffTool BeyondCompare, P4Merge, Kaleidoscope, - VisualDiffer, DeltaWalker, WinMerge, TortoiseMerge, @@ -27,6 +26,7 @@ public enum DiffTool AraxisMerge, Meld, SublimeMerge, + VisualDiffer, CodeCompare, VisualStudioCode, VisualStudio, From ace91bee8c1b2bf14e9c0afa1160c0260fb19646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Wed, 18 Nov 2026 17:54:19 +0100 Subject: [PATCH 7/8] Add --no-warning option to visdiff and notes about the sandbox --- src/DiffEngine.Tests/diffTools.include.md | 9 +++++++-- src/DiffEngine/Implementation/VisualDiffer.cs | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index 9f59fc6a..ef5fa8b0 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -1333,17 +1333,22 @@ Use [tool order](diff-tool.order.md) to prioritise VisualDiffer over other tools DiffTools.UseOrder(DiffTool.VisualDiffer); ``` +#### Notes: + + * `visdiff` runs inside the macOS sandbox, see [Sandbox and Trusted Paths](https://wiki.visualdiffer.com/unixshell.html#sandbox_and_trusted_paths) for more information + #### OSX settings: * Example target on left arguments: ``` - "targetFile.txt" "tempFile.txt" + --no-warning "targetFile.txt" "tempFile.txt" ``` * Example target on right arguments: ``` - "tempFile.txt" "targetFile.txt" + --no-warning "tempFile.txt" "targetFile.txt" ``` * Scanned paths: + * `/Applications/VisualDiffer.app/Contents/Helpers/visdiff` * `%PATH%visdiff` ### [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff) diff --git a/src/DiffEngine/Implementation/VisualDiffer.cs b/src/DiffEngine/Implementation/VisualDiffer.cs index bb20c554..214db229 100644 --- a/src/DiffEngine/Implementation/VisualDiffer.cs +++ b/src/DiffEngine/Implementation/VisualDiffer.cs @@ -22,7 +22,8 @@ public static Definition VisualDiffer() => Osx: new( "visdiff", new( - Left: (temp, target) => $"\"{target}\" \"{temp}\"", - Right: (temp, target) => $"\"{temp}\" \"{target}\""), - "/Applications/VisualDiffer.app/Contents/Helpers/"))); + Left: (temp, target) => $"--no-warning \"{target}\" \"{temp}\"", + Right: (temp, target) => $"--no-warning \"{temp}\" \"{target}\""), + "/Applications/VisualDiffer.app/Contents/Helpers/")), + Notes: " * `visdiff` runs inside the macOS sandbox, see [Sandbox and Trusted Paths](https://wiki.visualdiffer.com/unixshell.html#sandbox_and_trusted_paths) for more information"); } From e4139004f9fde0b2e57a0c8c1829f33e15839c9e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 18 Nov 2026 16:58:51 +0000 Subject: [PATCH 8/8] Docs changes --- docs/diff-tool.md | 9 +++++++-- docs/diff-tool.order.md | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index e45e8287..78e476ce 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -1501,17 +1501,22 @@ Use [tool order](diff-tool.order.md) to prioritise VisualDiffer over other tools DiffTools.UseOrder(DiffTool.VisualDiffer); ``` +#### Notes: + + * `visdiff` runs inside the macOS sandbox, see [Sandbox and Trusted Paths](https://wiki.visualdiffer.com/unixshell.html#sandbox_and_trusted_paths) for more information + #### OSX settings: * Example target on left arguments: ``` - "targetFile.txt" "tempFile.txt" + --no-warning "targetFile.txt" "tempFile.txt" ``` * Example target on right arguments: ``` - "tempFile.txt" "targetFile.txt" + --no-warning "tempFile.txt" "targetFile.txt" ``` * Scanned paths: + * `/Applications/VisualDiffer.app/Contents/Helpers/visdiff` * `%PATH%visdiff` ### [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff) diff --git a/docs/diff-tool.order.md b/docs/diff-tool.order.md index 612603de..8824c173 100644 --- a/docs/diff-tool.order.md +++ b/docs/diff-tool.order.md @@ -15,7 +15,6 @@ To change this file edit the source file and then run MarkdownSnippets. * **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid) * **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free) * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid) - * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Windows/OSX (Cost: Paid) * **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate) * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free) @@ -33,6 +32,7 @@ To change this file edit the source file and then run MarkdownSnippets. * **[AraxisMerge](/docs/diff-tool.md#araxismerge)** Windows/OSX (Cost: Paid) * **[Meld](/docs/diff-tool.md#meld)** Windows/OSX/Linux (Cost: Free) * **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Windows/OSX/Linux (Cost: Paid) + * **[VisualDiffer](/docs/diff-tool.md#visualdiffer)** OSX (Cost: Free) * **[CodeCompare](/docs/diff-tool.md#codecompare)** Windows (Cost: Free and Paid) * **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free) * **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options) @@ -57,5 +57,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o ```cs DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge); ``` -snippet source | anchor +snippet source | anchor