Skip to content

Commit 04daeee

Browse files
committed
docs
1 parent 07c5d2f commit 04daeee

6 files changed

Lines changed: 9 additions & 11 deletions

File tree

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ DiffEngine manages launching and cleanup of diff tools. It is designed to be use
7272
* **[Diffinity](/docs/diff-tool.md#diffinity)** Windows (Cost: Free with option to donate)
7373
* **[ExamDiff](/docs/diff-tool.md#examdiff)** Windows (Cost: Paid)
7474
* **[Guiffy](/docs/diff-tool.md#guiffy)** Windows/OSX (Cost: Paid)
75-
* **[KDiff3](/docs/diff-tool.md#kdiff3)** Windows/OSX (Cost: Free)
7675
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
76+
* **[KDiff3](/docs/diff-tool.md#kdiff3)** Windows/OSX (Cost: Free)
7777
* **[Meld](/docs/diff-tool.md#meld)** Windows/OSX/Linux (Cost: Free)
7878
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Free)
7979
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)

src/DiffEngine.Tests/defaultOrder.include.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)
2-
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Free)
1+
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Requires Word installed)
2+
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Requires Excel installed)
33
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid)
44
* **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free)
55
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)

src/DiffEngine.Tests/diffToolList.include.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
99
* **[KDiff3](/docs/diff-tool.md#kdiff3)** Windows/OSX (Cost: Free)
1010
* **[Meld](/docs/diff-tool.md#meld)** Windows/OSX/Linux (Cost: Free)
11-
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Free)
12-
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)
11+
* **[MsExcelDiff](/docs/diff-tool.md#msexceldiff)** Windows (Cost: Requires Excel installed)
12+
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Requires Word installed)
1313
* **[Neovim](/docs/diff-tool.md#neovim)** Windows/OSX/Linux (Cost: Free with option to sponsor)
1414
* **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free)
1515
* **[Rider](/docs/diff-tool.md#rider)** Windows/OSX/Linux (Cost: Paid with free option for OSS)

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ DiffTools.UseOrder(DiffTool.KDiff3);
350350

351351
### [MsExcelDiff](https://github.com/SimonCropp/MsOfficeDiff)
352352

353-
* Cost: Free
353+
* Cost: Requires Excel installed
354354
* Is MDI: False
355355
* Supports auto-refresh: False
356356
* Supports text files: False
@@ -389,7 +389,7 @@ DiffTools.UseOrder(DiffTool.MsExcelDiff);
389389

390390
### [MsWordDiff](https://github.com/SimonCropp/MsOfficeDiff)
391391

392-
* Cost: Free
392+
* Cost: Requires Word installed
393393
* Is MDI: False
394394
* Supports auto-refresh: False
395395
* Supports text files: False
@@ -409,7 +409,6 @@ DiffTools.UseOrder(DiffTool.MsWordDiff);
409409
#### Notes:
410410

411411
* Install via `dotnet tool install -g MsWordDiff`
412-
* Requires Microsoft Word to be installed
413412
* Uses Word's built-in document comparison feature
414413

415414
#### Windows settings:

src/DiffEngine/Implementation/MsExcelDiff.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static Definition MsExcelDiff()
1818
".xlsx",
1919
".xls"
2020
],
21-
Cost: "Free",
21+
Cost: "Requires Excel installed",
2222
OsSupport: new(
2323
Windows: new(
2424
"diffexcel.exe",

src/DiffEngine/Implementation/MsWordDiff.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static Definition MsWordDiff()
1818
".docx",
1919
".doc"
2020
],
21-
Cost: "Free",
21+
Cost: "Requires Word installed",
2222
OsSupport: new(
2323
Windows: new(
2424
"diffword.exe",
@@ -29,7 +29,6 @@ public static Definition MsWordDiff()
2929
KillLockingProcess: true,
3030
Notes: """
3131
* Install via `dotnet tool install -g MsWordDiff`
32-
* Requires Microsoft Word to be installed
3332
* Uses Word's built-in document comparison feature
3433
""");
3534
}

0 commit comments

Comments
 (0)