Skip to content

Commit 7f97f9f

Browse files
committed
/usr/bin/code for linux
1 parent cad5687 commit 7f97f9f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,10 @@
511511
### Linux settings:
512512

513513
* Example arguments: `--diff "targetFile" "tempFile"`
514-
* Scanned path: `/usr/local/bin/code`
514+
* Scanned paths:
515+
516+
* `/usr/local/bin/code`
517+
* `/usr/bin/code`
515518

516519

517520
## [WinMerge](https://winmerge.org/)

src/DiffEngine/Implementation/VsCode.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ static string Arguments(string temp, string target) =>
2323
@"%ProgramFiles%\Microsoft VS Code\code.exe"),
2424
linux: new(
2525
Arguments,
26-
"/usr/local/bin/code"),
26+
"/usr/local/bin/code",
27+
"/usr/bin/code"),
2728
osx: new(
2829
Arguments,
2930
"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"),

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<NoWarn>CS1591;CS0649</NoWarn>
5-
<Version>6.6.0-beta.2</Version>
5+
<Version>6.6.0</Version>
66
<AssemblyVersion>1.0.0</AssemblyVersion>
77
<PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
88
<Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>

0 commit comments

Comments
 (0)