Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/DiffEngine.Tests/defaultOrder.include.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Free)
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid)
* **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free)
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
Expand All @@ -21,5 +23,3 @@
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free)
* **[Cursor](/docs/diff-tool.md#cursor)** Windows/OSX/Linux (Cost: Free and Paid)
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options)
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Free)
4 changes: 2 additions & 2 deletions src/DiffEngine.Tests/diffToolList.include.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Free)
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid)
* **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free)
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
Expand All @@ -21,5 +23,3 @@
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free)
* **[Cursor](/docs/diff-tool.md#cursor)** Windows/OSX/Linux (Cost: Free and Paid)
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options)
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Free)
6 changes: 3 additions & 3 deletions src/DiffEngine/Definitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ public static class Definitions
static Definitions() =>
Tools =
[
Implementation.MsWordDiff(),
Implementation.MsExcelDiff(),
Implementation.BeyondCompare(),
Implementation.P4Merge(),
Implementation.Kaleidoscope(),
Expand All @@ -30,7 +32,5 @@ static Definitions() =>
Implementation.VisualStudioCode(),
Implementation.Cursor(),
Implementation.VisualStudio(),
Implementation.MsWordDiff(),
Implementation.MsExcelDiff()
];
}
}
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;CS0649;NU1608;NU1109</NoWarn>
<Version>19.1.0</Version>
<Version>19.1.1</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
<Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>
Expand Down
Loading