Skip to content

Commit f261c20

Browse files
authored
add missing meld path (#219)
1 parent 33f8ed0 commit f261c20

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

docs/diff-tool.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ ReSharper | Options | Tools | Unit Testing | Test Runner
348348
* Example arguments: `"tempFile" "targetFile"`
349349
* Scanned paths:
350350

351+
* `%LOCALAPPDATA%\Programs\Meld\meld.exe`
351352
* `%ProgramFiles%\Meld\meld.exe`
352353
* `%ProgramW6432%\Meld\meld.exe`
353354
* `%ProgramFiles(x86)%\Meld\meld.exe`

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@
248248
* Example arguments: `"tempFile" "targetFile"`
249249
* Scanned paths:
250250

251+
* `%LOCALAPPDATA%\Programs\Meld\meld.exe`
251252
* `%ProgramFiles%\Meld\meld.exe`
252253
* `%ProgramW6432%\Meld\meld.exe`
253254
* `%ProgramFiles(x86)%\Meld\meld.exe`

src/DiffEngine/Implementation/Meld.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ static string Arguments(string temp, string target) =>
1616
supportsText: true,
1717
requiresTarget: true,
1818
binaryExtensions: Array.Empty<string>(),
19-
windows: new(Arguments, @"%ProgramFiles%\Meld\meld.exe"),
19+
windows: new(
20+
Arguments,
21+
@"%LOCALAPPDATA%\Programs\Meld\meld.exe",
22+
@"%ProgramFiles%\Meld\meld.exe"),
2023
linux: new(Arguments, "/usr/bin/meld"),
2124
osx: new(Arguments, "/Applications/meld.app/Contents/MacOS/meld"));
2225
}

0 commit comments

Comments
 (0)