Skip to content

Commit 2c97428

Browse files
committed
Also search bin for kdiff
1 parent 359ae6e commit 2c97428

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
188188
* Example target on left arguments: `"targetFile.txt" "tempFile.txt" --cs CreateBakFiles=0 `
189189
* Example target on right arguments: `"tempFile.txt" "targetFile.txt" --cs CreateBakFiles=0 `
190190
* Scanned paths:
191+
* `%ProgramFiles%\KDiff3\bin\kdiff3.exe`
192+
* `%ProgramW6432%\KDiff3\bin\kdiff3.exe`
193+
* `%ProgramFiles(x86)%\KDiff3\bin\kdiff3.exe`
191194
* `%ProgramFiles%\KDiff3\kdiff3.exe`
192195
* `%ProgramW6432%\KDiff3\kdiff3.exe`
193196
* `%ProgramFiles(x86)%\KDiff3\kdiff3.exe`

src/DiffEngine/Implementation/KDiff3.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static Definition KDiff3()
1919
Windows: new(
2020
"kdiff3.exe",
2121
launchArguments,
22-
@"%ProgramFiles%\KDiff3\"),
22+
@"%ProgramFiles%\KDiff3\bin\", @"%ProgramFiles%\KDiff3\"),
2323
Osx: new(
2424
"kdiff3",
2525
launchArguments,

0 commit comments

Comments
 (0)