Skip to content

Commit 4b1cf50

Browse files
SimonCroppSimonCropp
authored
Add MsWordDiff support (#667)
1 parent d3d22b5 commit 4b1cf50

19 files changed

+284
-102
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.snk binary
33
*.bin binary
44
*.png binary
5+
*.docx binary
56

67
src/Verify/EmptyFiles/* binary
78

‎docs/diff-tool.md‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
146146
* Supports auto-refresh: True
147147
* Supports text files: True
148148
* Use shell execute: True
149+
* Create no window: False
149150
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
150151
* Supported binaries: .7z, .bcpkg, .bin, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .webp, .wim, .xlsx, .xz, .zip, .zipx
151152

@@ -216,6 +217,7 @@ DiffTools.UseOrder(DiffTool.BeyondCompare);
216217
* Supports auto-refresh: True
217218
* Supports text files: True
218219
* Use shell execute: True
220+
* Create no window: False
219221
* Environment variable for custom install location: `DiffEngine_DeltaWalker`
220222
* Supported binaries: .bmp, .bz2, .doc, .docx, .ear, .gif, .gz, .htm, .html, .ico, .j2k, .jar, .jp2, .jpg, .pbm, .pct, .pdf, .pgm, .pic, .pict, .png, .pnm, .ppm, .ppt, .psd, .rtf, .svg, .tar, .tbz2, .tgz, .tif, .xls, .xlsx, .zip
221223

@@ -268,6 +270,7 @@ DiffTools.UseOrder(DiffTool.DeltaWalker);
268270
* Supports auto-refresh: True
269271
* Supports text files: True
270272
* Use shell execute: True
273+
* Create no window: False
271274
* Environment variable for custom install location: `DiffEngine_Diffinity`
272275
* Supported binaries: .svg
273276

@@ -302,6 +305,7 @@ DiffTools.UseOrder(DiffTool.Diffinity);
302305
* Supports auto-refresh: True
303306
* Supports text files: True
304307
* Use shell execute: True
308+
* Create no window: False
305309
* Environment variable for custom install location: `DiffEngine_ExamDiff`
306310
* Supported binaries: .bin, .svg
307311

@@ -342,6 +346,7 @@ DiffTools.UseOrder(DiffTool.ExamDiff);
342346
* Supports auto-refresh: False
343347
* Supports text files: True
344348
* Use shell execute: True
349+
* Create no window: False
345350
* Environment variable for custom install location: `DiffEngine_Guiffy`
346351
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .png, .svg, .wbmp
347352

@@ -397,6 +402,7 @@ DiffTools.UseOrder(DiffTool.Guiffy);
397402
* Supports auto-refresh: True
398403
* Supports text files: True
399404
* Use shell execute: True
405+
* Create no window: False
400406
* Environment variable for custom install location: `DiffEngine_Kaleidoscope`
401407
* Supported binaries: .bin, .bmp, .gif, .ico, .jpeg, .jpg, .png, .svg, .tif, .tiff
402408

@@ -428,6 +434,7 @@ DiffTools.UseOrder(DiffTool.Kaleidoscope);
428434
* Supports auto-refresh: False
429435
* Supports text files: True
430436
* Use shell execute: True
437+
* Create no window: False
431438
* Environment variable for custom install location: `DiffEngine_KDiff3`
432439
* Supported binaries: .svg
433440

@@ -476,13 +483,53 @@ DiffTools.UseOrder(DiffTool.KDiff3);
476483
* `/Applications/kdiff3.app/Contents/MacOS/kdiff3`
477484
* `%PATH%kdiff3`
478485

486+
### [MsWordDiff](https://github.com/SimonCropp/MsWordDiff)
487+
488+
* Cost: Free
489+
* Is MDI: False
490+
* Supports auto-refresh: False
491+
* Supports text files: False
492+
* Use shell execute: False
493+
* Create no window: True
494+
* Environment variable for custom install location: `DiffEngine_MsWordDiff`
495+
* Supported binaries: .doc, .docx
496+
497+
#### Tool order:
498+
499+
Use [tool order](diff-tool.order.md) to prioritise MsWordDiff over other tools.
500+
501+
```
502+
DiffTools.UseOrder(DiffTool.MsWordDiff);
503+
```
504+
505+
#### Notes:
506+
507+
* Install via `dotnet tool install -g MsWordDiff`
508+
* Requires Microsoft Word to be installed
509+
* Uses Word's built-in document comparison feature
510+
511+
#### Windows settings:
512+
513+
* Example target on left arguments:
514+
```
515+
"targetFile.txt" "tempFile.txt"
516+
```
517+
* Example target on right arguments:
518+
```
519+
"tempFile.txt" "targetFile.txt"
520+
```
521+
* Scanned paths:
522+
* `%USERPROFILE%\.dotnet\tools\diffword.exe`
523+
* `%PATH%diffword.exe`
524+
479525
### [Neovim](https://neovim.io/)
480526

481527
* Cost: Free with option to sponsor
482528
* Is MDI: False
483529
* Supports auto-refresh: False
484530
* Supports text files: True
485531
* Use shell execute: True
532+
* Create no window: False
486533
* Environment variable for custom install location: `DiffEngine_Neovim`
487534
* Supported binaries: .svg
488535

@@ -545,6 +592,7 @@ DiffTools.UseOrder(DiffTool.Neovim);
545592
* Supports auto-refresh: False
546593
* Supports text files: True
547594
* Use shell execute: True
595+
* Create no window: False
548596
* Environment variable for custom install location: `DiffEngine_P4Merge`
549597
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .pbm, .pgm, .png, .ppm, .svg, .tif, .tiff, .xbm, .xpm
550598

@@ -630,6 +678,7 @@ DiffTools.UseOrder(DiffTool.P4Merge);
630678
* Supports auto-refresh: True
631679
* Supports text files: True
632680
* Use shell execute: True
681+
* Create no window: False
633682
* Environment variable for custom install location: `DiffEngine_Rider`
634683
* Supported binaries: .svg
635684

@@ -698,6 +747,7 @@ DiffTools.UseOrder(DiffTool.Rider);
698747
* Supports auto-refresh: False
699748
* Supports text files: True
700749
* Use shell execute: True
750+
* Create no window: False
701751
* Environment variable for custom install location: `DiffEngine_TkDiff`
702752
* Supported binaries: .svg
703753

@@ -730,6 +780,7 @@ DiffTools.UseOrder(DiffTool.TkDiff);
730780
* Supports auto-refresh: False
731781
* Supports text files: False
732782
* Use shell execute: True
783+
* Create no window: False
733784
* Environment variable for custom install location: `DiffEngine_TortoiseGitIDiff`
734785
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
735786

@@ -764,6 +815,7 @@ DiffTools.UseOrder(DiffTool.TortoiseGitIDiff);
764815
* Supports auto-refresh: False
765816
* Supports text files: True
766817
* Use shell execute: True
818+
* Create no window: False
767819
* Environment variable for custom install location: `DiffEngine_TortoiseGitMerge`
768820
* Supported binaries: .bin, .svg
769821

@@ -798,6 +850,7 @@ DiffTools.UseOrder(DiffTool.TortoiseGitMerge);
798850
* Supports auto-refresh: False
799851
* Supports text files: False
800852
* Use shell execute: True
853+
* Create no window: False
801854
* Environment variable for custom install location: `DiffEngine_TortoiseIDiff`
802855
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
803856

@@ -832,6 +885,7 @@ DiffTools.UseOrder(DiffTool.TortoiseIDiff);
832885
* Supports auto-refresh: False
833886
* Supports text files: True
834887
* Use shell execute: True
888+
* Create no window: False
835889
* Environment variable for custom install location: `DiffEngine_TortoiseMerge`
836890
* Supported binaries: .svg
837891

@@ -866,6 +920,7 @@ DiffTools.UseOrder(DiffTool.TortoiseMerge);
866920
* Supports auto-refresh: True
867921
* Supports text files: True
868922
* Use shell execute: True
923+
* Create no window: False
869924
* Environment variable for custom install location: `DiffEngine_Vim`
870925
* Supported binaries: .svg
871926

@@ -922,6 +977,7 @@ DiffTools.UseOrder(DiffTool.Vim);
922977
* Supports auto-refresh: True
923978
* Supports text files: True
924979
* Use shell execute: True
980+
* Create no window: False
925981
* Environment variable for custom install location: `DiffEngine_WinMerge`
926982
* Supported binaries: .bin, .bmp, .bw, .cut, .dds, .exr, .g3, .gif, .hdp, .hdr, .ico, .iff, .j2c, .j2k, .jif, .jng, .jp2, .jpe, .jpeg, .jpg, .jxr, .koa, .lbm, .mng, .pbm, .pcd, .pct, .pcx, .pfm, .pgm, .pic, .pict, .png, .ppm, .psd, .ras, .rgb, .rgba, .sgi, .svg, .targa, .tga, .tif, .tiff, .wap, .wbm, .wbmp, .wdp, .webp, .xbm, .xpm
927983

@@ -969,6 +1025,7 @@ DiffTools.UseOrder(DiffTool.WinMerge);
9691025
* Supports auto-refresh: True
9701026
* Supports text files: True
9711027
* Use shell execute: True
1028+
* Create no window: False
9721029
* Environment variable for custom install location: `DiffEngine_AraxisMerge`
9731030
* Supported binaries: .bmp, .dib, .emf, .gif, .j2c, .j2k, .jif, .jp2, .jpc, .jpeg, .jpg, .jpx, .pbm, .pcx, .pgm, .png, .ppm, .ras, .svg, .tga, .tif, .tiff, .wmf
9741031

@@ -1024,6 +1081,7 @@ DiffTools.UseOrder(DiffTool.AraxisMerge);
10241081
* Supports auto-refresh: True
10251082
* Supports text files: True
10261083
* Use shell execute: False
1084+
* Create no window: False
10271085
* Environment variable for custom install location: `DiffEngine_Cursor`
10281086
* Supported binaries: .bin, .svg
10291087

@@ -1089,6 +1147,7 @@ DiffTools.UseOrder(DiffTool.Cursor);
10891147
* Supports auto-refresh: False
10901148
* Supports text files: True
10911149
* Use shell execute: True
1150+
* Create no window: False
10921151
* Environment variable for custom install location: `DiffEngine_Meld`
10931152
* Supported binaries: .svg
10941153

@@ -1155,6 +1214,7 @@ DiffTools.UseOrder(DiffTool.Meld);
11551214
* Supports auto-refresh: False
11561215
* Supports text files: True
11571216
* Use shell execute: True
1217+
* Create no window: False
11581218
* Environment variable for custom install location: `DiffEngine_SublimeMerge`
11591219
* Supported binaries: .svg
11601220

@@ -1220,6 +1280,7 @@ DiffTools.UseOrder(DiffTool.SublimeMerge);
12201280
* Supports auto-refresh: True
12211281
* Supports text files: True
12221282
* Use shell execute: True
1283+
* Create no window: False
12231284
* Environment variable for custom install location: `DiffEngine_VisualStudio`
12241285
* Supported binaries: .svg
12251286

@@ -1263,6 +1324,7 @@ DiffTools.UseOrder(DiffTool.VisualStudio);
12631324
* Supports auto-refresh: True
12641325
* Supports text files: True
12651326
* Use shell execute: False
1327+
* Create no window: False
12661328
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
12671329
* Supported binaries: .bin, .svg
12681330

‎docs/diff-tool.order.md‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,30 @@ To change this file edit the source file and then run MarkdownSnippets.
1010

1111
## Default
1212

13-
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Win/OSX/Linux (Cost: Paid)<!-- include: defaultOrder. path: /src/DiffEngine.Tests/defaultOrder.include.md -->
14-
* **[P4Merge](/docs/diff-tool.md#p4merge)** Win/OSX/Linux (Cost: Free)
13+
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid)<!-- include: defaultOrder. path: /src/DiffEngine.Tests/defaultOrder.include.md -->
14+
* **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free)
1515
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
16-
* **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
17-
* **[WinMerge](/docs/diff-tool.md#winmerge)** Win (Cost: Free with option to donate)
18-
* **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Win (Cost: Free)
19-
* **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Win (Cost: Free)
20-
* **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Win (Cost: Free)
21-
* **[TortoiseIDiff](/docs/diff-tool.md#tortoiseidiff)** Win (Cost: Free)
22-
* **[KDiff3](/docs/diff-tool.md#kdiff3)** Win/OSX (Cost: Free)
16+
* **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Windows/OSX (Cost: Paid)
17+
* **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate)
18+
* **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Windows (Cost: Free)
19+
* **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Windows (Cost: Free)
20+
* **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free)
21+
* **[TortoiseIDiff](/docs/diff-tool.md#tortoiseidiff)** Windows (Cost: Free)
22+
* **[KDiff3](/docs/diff-tool.md#kdiff3)** Windows/OSX (Cost: Free)
2323
* **[TkDiff](/docs/diff-tool.md#tkdiff)** OSX (Cost: Free)
24-
* **[Guiffy](/docs/diff-tool.md#guiffy)** Win/OSX (Cost: Paid)
25-
* **[ExamDiff](/docs/diff-tool.md#examdiff)** Win (Cost: Paid)
26-
* **[Diffinity](/docs/diff-tool.md#diffinity)** Win (Cost: Free with option to donate)
27-
* **[Rider](/docs/diff-tool.md#rider)** Win/OSX/Linux (Cost: Paid with free option for OSS)
28-
* **[Vim](/docs/diff-tool.md#vim)** Win/OSX (Cost: Free with option to donate)
29-
* **[Neovim](/docs/diff-tool.md#neovim)** Win/OSX/Linux (Cost: Free with option to sponsor)
30-
* **[AraxisMerge](/docs/diff-tool.md#araxismerge)** Win/OSX (Cost: Paid)
31-
* **[Meld](/docs/diff-tool.md#meld)** Win/OSX/Linux (Cost: Free)
32-
* **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Win/OSX/Linux (Cost: Paid)
33-
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Win/OSX/Linux (Cost: Free)
34-
* **[Cursor](/docs/diff-tool.md#cursor)** Win/OSX/Linux (Cost: Free and Paid)
35-
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Win (Cost: Paid and free options)<!-- endInclude -->
24+
* **[Guiffy](/docs/diff-tool.md#guiffy)** Windows/OSX (Cost: Paid)
25+
* **[ExamDiff](/docs/diff-tool.md#examdiff)** Windows (Cost: Paid)
26+
* **[Diffinity](/docs/diff-tool.md#diffinity)** Windows (Cost: Free with option to donate)
27+
* **[Rider](/docs/diff-tool.md#rider)** Windows/OSX/Linux (Cost: Paid with free option for OSS)
28+
* **[Vim](/docs/diff-tool.md#vim)** Windows/OSX (Cost: Free with option to donate)
29+
* **[Neovim](/docs/diff-tool.md#neovim)** Windows/OSX/Linux (Cost: Free with option to sponsor)
30+
* **[AraxisMerge](/docs/diff-tool.md#araxismerge)** Windows/OSX (Cost: Paid)
31+
* **[Meld](/docs/diff-tool.md#meld)** Windows/OSX/Linux (Cost: Free)
32+
* **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Windows/OSX/Linux (Cost: Paid)
33+
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free)
34+
* **[Cursor](/docs/diff-tool.md#cursor)** Windows/OSX/Linux (Cost: Free and Paid)
35+
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options)
36+
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)<!-- endInclude -->
3637

3738

3839
## Custom order
@@ -52,5 +53,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
5253
```cs
5354
DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
5455
```
55-
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L183-L187' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
56+
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L189-L193' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
5657
<!-- endSnippet -->

‎readme.md‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,30 @@ DiffEngine manages launching and cleanup of diff tools. It is designed to be use
6363

6464
## [Supported Tools](/docs/diff-tool.md#supported-tools)
6565

66-
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Win/OSX/Linux (Cost: Paid)<!-- include: diffToolList. path: /src/DiffEngine.Tests/diffToolList.include.md -->
67-
* **[P4Merge](/docs/diff-tool.md#p4merge)** Win/OSX/Linux (Cost: Free)
66+
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Windows/OSX/Linux (Cost: Paid)<!-- include: diffToolList. path: /src/DiffEngine.Tests/diffToolList.include.md -->
67+
* **[P4Merge](/docs/diff-tool.md#p4merge)** Windows/OSX/Linux (Cost: Free)
6868
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
69-
* **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
70-
* **[WinMerge](/docs/diff-tool.md#winmerge)** Win (Cost: Free with option to donate)
71-
* **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Win (Cost: Free)
72-
* **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Win (Cost: Free)
73-
* **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Win (Cost: Free)
74-
* **[TortoiseIDiff](/docs/diff-tool.md#tortoiseidiff)** Win (Cost: Free)
75-
* **[KDiff3](/docs/diff-tool.md#kdiff3)** Win/OSX (Cost: Free)
69+
* **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Windows/OSX (Cost: Paid)
70+
* **[WinMerge](/docs/diff-tool.md#winmerge)** Windows (Cost: Free with option to donate)
71+
* **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Windows (Cost: Free)
72+
* **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Windows (Cost: Free)
73+
* **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Windows (Cost: Free)
74+
* **[TortoiseIDiff](/docs/diff-tool.md#tortoiseidiff)** Windows (Cost: Free)
75+
* **[KDiff3](/docs/diff-tool.md#kdiff3)** Windows/OSX (Cost: Free)
7676
* **[TkDiff](/docs/diff-tool.md#tkdiff)** OSX (Cost: Free)
77-
* **[Guiffy](/docs/diff-tool.md#guiffy)** Win/OSX (Cost: Paid)
78-
* **[ExamDiff](/docs/diff-tool.md#examdiff)** Win (Cost: Paid)
79-
* **[Diffinity](/docs/diff-tool.md#diffinity)** Win (Cost: Free with option to donate)
80-
* **[Rider](/docs/diff-tool.md#rider)** Win/OSX/Linux (Cost: Paid with free option for OSS)
81-
* **[Vim](/docs/diff-tool.md#vim)** Win/OSX (Cost: Free with option to donate)
82-
* **[Neovim](/docs/diff-tool.md#neovim)** Win/OSX/Linux (Cost: Free with option to sponsor)
83-
* **[AraxisMerge](/docs/diff-tool.md#araxismerge)** Win/OSX (Cost: Paid)
84-
* **[Meld](/docs/diff-tool.md#meld)** Win/OSX/Linux (Cost: Free)
85-
* **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Win/OSX/Linux (Cost: Paid)
86-
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Win/OSX/Linux (Cost: Free)
87-
* **[Cursor](/docs/diff-tool.md#cursor)** Win/OSX/Linux (Cost: Free and Paid)
88-
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Win (Cost: Paid and free options)<!-- endInclude -->
77+
* **[Guiffy](/docs/diff-tool.md#guiffy)** Windows/OSX (Cost: Paid)
78+
* **[ExamDiff](/docs/diff-tool.md#examdiff)** Windows (Cost: Paid)
79+
* **[Diffinity](/docs/diff-tool.md#diffinity)** Windows (Cost: Free with option to donate)
80+
* **[Rider](/docs/diff-tool.md#rider)** Windows/OSX/Linux (Cost: Paid with free option for OSS)
81+
* **[Vim](/docs/diff-tool.md#vim)** Windows/OSX (Cost: Free with option to donate)
82+
* **[Neovim](/docs/diff-tool.md#neovim)** Windows/OSX/Linux (Cost: Free with option to sponsor)
83+
* **[AraxisMerge](/docs/diff-tool.md#araxismerge)** Windows/OSX (Cost: Paid)
84+
* **[Meld](/docs/diff-tool.md#meld)** Windows/OSX/Linux (Cost: Free)
85+
* **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Windows/OSX/Linux (Cost: Paid)
86+
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Windows/OSX/Linux (Cost: Free)
87+
* **[Cursor](/docs/diff-tool.md#cursor)** Windows/OSX/Linux (Cost: Free and Paid)
88+
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Windows (Cost: Paid and free options)
89+
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Windows (Cost: Free)<!-- endInclude -->
8990

9091

9192
## Launching a tool

‎src/DiffEngine.Tests/DefinitionsTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static string GetOsSupport(OsSupport osSupport)
4646
var builder = new StringBuilder();
4747
if (osSupport.Windows != null)
4848
{
49-
builder.Append("Win/");
49+
builder.Append("Windows/");
5050
}
5151

5252
if (osSupport.Osx != null)
@@ -125,6 +125,7 @@ static void AddTool(StreamWriter writer, Definition tool)
125125
* Supports auto-refresh: {tool.AutoRefresh}
126126
* Supports text files: {tool.SupportsText}
127127
* Use shell execute: {tool.UseShellExecute}
128+
* Create no window: {tool.CreateNoWindow}
128129
* Environment variable for custom install location: `DiffEngine_{tool.Tool}`
129130
""");
130131

‎src/DiffEngine.Tests/DiffToolsTest.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ static async Task AddToolAndLaunch()
112112
}
113113
/**
114114
115+
[Fact]
116+
public Task LaunchSpecificDocxDiff() =>
117+
DiffRunner.LaunchAsync(DiffTool.MsWordDiff,
118+
Path.Combine(SourceDirectory, "input.temp.docx"),
119+
Path.Combine(SourceDirectory, "input.target.docx"));
120+
115121
[Fact]
116122
public Task LaunchSpecificBinaryDiff() =>
117123
DiffRunner.LaunchAsync(DiffTool.VisualStudioCode,

0 commit comments

Comments
 (0)