Skip to content

Commit

Permalink
docs
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Jul 14, 2021
1 parent e109832 commit ab1d7e4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/diff-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* `%ProgramFiles%\Beyond Compare *\BCompare.exe`
* `%ProgramW6432%\Beyond Compare *\BCompare.exe`
* `%ProgramFiles(x86)%\Beyond Compare *\BCompare.exe`
* `%UserProfile%\scoop\apps\beyondcompare\current\BCompare.exe`

#### OSX settings:

Expand Down Expand Up @@ -182,6 +183,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* `%ProgramFiles%\Diffinity\Diffinity.exe`
* `%ProgramW6432%\Diffinity\Diffinity.exe`
* `%ProgramFiles(x86)%\Diffinity\Diffinity.exe`
* `%UserProfile%\scoop\apps\diffinity\current\Diffinity.exe`


### [DiffMerge](https://www.sourcegear.com/diffmerge/)
Expand Down
2 changes: 2 additions & 0 deletions src/DiffEngine.Tests/diffTools.include.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* `%ProgramFiles%\Beyond Compare *\BCompare.exe`
* `%ProgramW6432%\Beyond Compare *\BCompare.exe`
* `%ProgramFiles(x86)%\Beyond Compare *\BCompare.exe`
* `%UserProfile%\scoop\apps\beyondcompare\current\BCompare.exe`

#### OSX settings:

Expand Down Expand Up @@ -82,6 +83,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* `%ProgramFiles%\Diffinity\Diffinity.exe`
* `%ProgramW6432%\Diffinity\Diffinity.exe`
* `%ProgramFiles(x86)%\Diffinity\Diffinity.exe`
* `%UserProfile%\scoop\apps\diffinity\current\Diffinity.exe`


### [DiffMerge](https://www.sourcegear.com/diffmerge/)
Expand Down

0 comments on commit ab1d7e4

Please sign in to comment.