diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 44220287..7c4c636e 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -348,6 +348,7 @@ ReSharper | Options | Tools | Unit Testing | Test Runner * Example arguments: `"tempFile" "targetFile"` * Scanned paths: + * `%LOCALAPPDATA%\Programs\Meld\meld.exe` * `%ProgramFiles%\Meld\meld.exe` * `%ProgramW6432%\Meld\meld.exe` * `%ProgramFiles(x86)%\Meld\meld.exe` diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index 2785e992..2bbdd1de 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -248,6 +248,7 @@ * Example arguments: `"tempFile" "targetFile"` * Scanned paths: + * `%LOCALAPPDATA%\Programs\Meld\meld.exe` * `%ProgramFiles%\Meld\meld.exe` * `%ProgramW6432%\Meld\meld.exe` * `%ProgramFiles(x86)%\Meld\meld.exe` diff --git a/src/DiffEngine/Implementation/Meld.cs b/src/DiffEngine/Implementation/Meld.cs index e820ff61..d5c92a63 100644 --- a/src/DiffEngine/Implementation/Meld.cs +++ b/src/DiffEngine/Implementation/Meld.cs @@ -16,7 +16,10 @@ public static Definition Meld() supportsText: true, requiresTarget: true, binaryExtensions: Array.Empty(), - windows: new(Arguments, @"%ProgramFiles%\Meld\meld.exe"), + windows: new( + Arguments, + @"%LOCALAPPDATA%\Programs\Meld\meld.exe", + @"%ProgramFiles%\Meld\meld.exe"), linux: new(Arguments, "/usr/bin/meld"), osx: new(Arguments, "/Applications/meld.app/Contents/MacOS/meld")); }