Skip to content

Commit ae37d2c

Browse files
committed
docs
1 parent 0c0ef96 commit ae37d2c

3 files changed

Lines changed: 27 additions & 0 deletions

File tree

docs/mdsource/diff-tool.source.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,6 @@ ReSharper | Options | Tools | Unit Testing | Test Runner
9696

9797
## Supported Tools:
9898

99+
Tools location is automatically detected. If a tool installed in a custom location, it can be manually configured using an environment variable, that points to the executable. The environment variable format is `DiffEngine_{ToolName}`.
100+
99101
include: diffTools

src/DiffEngine.Tests/DefinitionsTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ static void AddTool(StreamWriter writer, Definition tool)
120120
* Is MDI: {tool.IsMdi}
121121
* Supports auto-refresh: {tool.AutoRefresh}
122122
* Supports text files: {tool.SupportsText}
123+
* Environment variable for custom install location: `DiffEngine_{tool.Tool}`
123124
""");
124125

125126
if (tool.BinaryExtensions.Any())

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
1010
* Is MDI: False
1111
* Supports auto-refresh: True
1212
* Supports text files: True
13+
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
1314
* Supported binaries: pdf, bmp, gif, ico, jpg, jpeg, png, tif, tiff, rtf
1415

1516
#### Notes:
@@ -48,6 +49,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
4849
* Is MDI: False
4950
* Supports auto-refresh: True
5051
* Supports text files: True
52+
* Environment variable for custom install location: `DiffEngine_DeltaWalker`
5153
* Supported binaries: jpg, jp2, j2k, png, gif, psd, tif, bmp, pct, pict, pic, ico, ppm, pgm, pbm, pnm, zip, jar, ear, tar, tgz, tbz2, gz, bz2, doc, docx, xls, xlsx, ppt, pdf, rtf, html, htm
5254

5355
#### Notes:
@@ -76,6 +78,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
7678
* Is MDI: False
7779
* Supports auto-refresh: True
7880
* Supports text files: True
81+
* Environment variable for custom install location: `DiffEngine_Diffinity`
7982

8083
#### Notes:
8184

@@ -98,6 +101,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
98101
* Is MDI: False
99102
* Supports auto-refresh: True
100103
* Supports text files: True
104+
* Environment variable for custom install location: `DiffEngine_DiffMerge`
101105

102106
#### Notes:
103107

@@ -134,6 +138,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
134138
* Is MDI: False
135139
* Supports auto-refresh: True
136140
* Supports text files: True
141+
* Environment variable for custom install location: `DiffEngine_ExamDiff`
137142

138143
#### Notes:
139144

@@ -157,6 +162,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
157162
* Is MDI: False
158163
* Supports auto-refresh: False
159164
* Supports text files: True
165+
* Environment variable for custom install location: `DiffEngine_Guiffy`
160166
* Supported binaries: bmp, gif, jpeg, jpg, png, wbmp
161167

162168
#### Notes:
@@ -190,6 +196,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
190196
* Is MDI: False
191197
* Supports auto-refresh: True
192198
* Supports text files: True
199+
* Environment variable for custom install location: `DiffEngine_Kaleidoscope`
193200
* Supported binaries: bmp, gif, ico, jpg, jpeg, png, tiff, tif
194201

195202
#### OSX settings:
@@ -205,6 +212,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
205212
* Is MDI: False
206213
* Supports auto-refresh: False
207214
* Supports text files: True
215+
* Environment variable for custom install location: `DiffEngine_KDiff3`
208216

209217
#### Notes:
210218

@@ -234,6 +242,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
234242
* Is MDI: False
235243
* Supports auto-refresh: False
236244
* Supports text files: True
245+
* Environment variable for custom install location: `DiffEngine_Neovim`
237246

238247
#### Notes:
239248

@@ -266,6 +275,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
266275
* Is MDI: False
267276
* Supports auto-refresh: False
268277
* Supports text files: True
278+
* Environment variable for custom install location: `DiffEngine_P4Merge`
269279
* Supported binaries: bmp, gif, jpg, jpeg, png, pbm, pgm, ppm, tif, tiff, xbm, xpm
270280

271281
#### Windows settings:
@@ -305,6 +315,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
305315
* Is MDI: False
306316
* Supports auto-refresh: True
307317
* Supports text files: True
318+
* Environment variable for custom install location: `DiffEngine_Rider`
308319

309320
#### Notes:
310321

@@ -350,6 +361,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
350361
* Is MDI: False
351362
* Supports auto-refresh: False
352363
* Supports text files: True
364+
* Environment variable for custom install location: `DiffEngine_TkDiff`
353365

354366
#### OSX settings:
355367

@@ -365,6 +377,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
365377
* Is MDI: False
366378
* Supports auto-refresh: False
367379
* Supports text files: False
380+
* Environment variable for custom install location: `DiffEngine_TortoiseGitIDiff`
368381
* Supported binaries: bmp, gif, ico, jpg, jpeg, png, tif, tiff
369382

370383
#### Windows settings:
@@ -383,6 +396,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
383396
* Is MDI: False
384397
* Supports auto-refresh: False
385398
* Supports text files: True
399+
* Environment variable for custom install location: `DiffEngine_TortoiseGitMerge`
386400

387401
#### Windows settings:
388402

@@ -400,6 +414,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
400414
* Is MDI: False
401415
* Supports auto-refresh: False
402416
* Supports text files: False
417+
* Environment variable for custom install location: `DiffEngine_TortoiseIDiff`
403418
* Supported binaries: bmp, gif, ico, jpg, jpeg, png, tif, tiff
404419

405420
#### Windows settings:
@@ -418,6 +433,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
418433
* Is MDI: False
419434
* Supports auto-refresh: False
420435
* Supports text files: True
436+
* Environment variable for custom install location: `DiffEngine_TortoiseMerge`
421437

422438
#### Windows settings:
423439

@@ -435,6 +451,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
435451
* Is MDI: False
436452
* Supports auto-refresh: True
437453
* Supports text files: True
454+
* Environment variable for custom install location: `DiffEngine_Vim`
438455

439456
#### Notes:
440457

@@ -468,6 +485,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
468485
* Is MDI: False
469486
* Supports auto-refresh: True
470487
* Supports text files: True
488+
* Environment variable for custom install location: `DiffEngine_WinMerge`
471489
* Supported binaries: bmp, cut, dds, exr, g3, gif, hdr, ico, iff, lbm, j2k, j2c, jng, jp2, jpg, jif, jpeg, jpe, jxr, wdp, hdp, koa, mng, pcd, pcx, pfm, pct, pict, pic, png, pbm, pgm, ppm, psd, ras, sgi, rgb, rgba, bw, tga, targa, tif, tiff, wap, wbmp, wbm, webp, xbm, xpm
472490

473491
#### Notes:
@@ -498,6 +516,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
498516
* Is MDI: True
499517
* Supports auto-refresh: True
500518
* Supports text files: True
519+
* Environment variable for custom install location: `DiffEngine_AraxisMerge`
501520
* Supported binaries: bmp, dib, emf, gif, jif, j2c, j2k, jp2, jpc, jpeg, jpg, jpx, pbm, pcx, pgm, png, ppm, ras, tif, tiff, tga, wmf
502521

503522
#### Notes:
@@ -531,6 +550,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
531550
* Is MDI: True
532551
* Supports auto-refresh: False
533552
* Supports text files: True
553+
* Environment variable for custom install location: `DiffEngine_CodeCompare`
534554

535555
#### Notes:
536556

@@ -552,6 +572,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
552572
* Is MDI: True
553573
* Supports auto-refresh: False
554574
* Supports text files: True
575+
* Environment variable for custom install location: `DiffEngine_Meld`
555576

556577
#### Notes:
557578

@@ -589,6 +610,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
589610
* Is MDI: True
590611
* Supports auto-refresh: False
591612
* Supports text files: True
613+
* Environment variable for custom install location: `DiffEngine_SublimeMerge`
592614

593615
#### Notes:
594616

@@ -625,6 +647,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
625647
* Is MDI: True
626648
* Supports auto-refresh: True
627649
* Supports text files: True
650+
* Environment variable for custom install location: `DiffEngine_VisualStudio`
628651

629652
#### Windows settings:
630653

@@ -651,6 +674,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
651674
* Is MDI: True
652675
* Supports auto-refresh: True
653676
* Supports text files: True
677+
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
654678

655679
#### Notes:
656680

0 commit comments

Comments
 (0)