Skip to content

Commit a1543dc

Browse files
SimonCroppSimonCropp
committed
docs
1 parent ac94114 commit a1543dc

File tree

3 files changed

+47
-0
lines changed

3 files changed

+47
-0
lines changed

‎docs/diff-tool.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
109109

110110
### [BeyondCompare](https://www.scootersoftware.com)
111111

112+
* Is MDI: False
112113
* Supports auto-refresh: True
113114
* Supports text files: True
114115
* Supported binaries: mp3, xls, xlsm, xlsx, doc, docm, docx, dot, dotm, dotx, pdf, bmp, gif, ico, jpg, jpeg, png, tif, tiff, rtf
@@ -139,6 +140,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
139140

140141
### [DeltaWalker](https://www.deltawalker.com/)
141142

143+
* Is MDI: False
142144
* Supports auto-refresh: False
143145
* Supports text files: True
144146
* 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
@@ -160,6 +162,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
160162

161163
### [Diffinity](https://truehumandesign.se/s_diffinity.php)
162164

165+
* Is MDI: False
163166
* Supports auto-refresh: True
164167
* Supports text files: True
165168

@@ -180,6 +183,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
180183

181184
### [DiffMerge](https://www.sourcegear.com/diffmerge/)
182185

186+
* Is MDI: False
183187
* Supports auto-refresh: False
184188
* Supports text files: True
185189

@@ -205,6 +209,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
205209

206210
### [ExamDiff](https://www.prestosoft.com/edp_examdiffpro.asp)
207211

212+
* Is MDI: False
208213
* Supports auto-refresh: True
209214
* Supports text files: True
210215

@@ -226,6 +231,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
226231

227232
### [Guiffy](https://www.guiffy.com/)
228233

234+
* Is MDI: False
229235
* Supports auto-refresh: False
230236
* Supports text files: True
231237
* Supported binaries: bmp, gif, jpeg, jpg, png, wbmp
@@ -253,6 +259,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
253259

254260
### [Kaleidoscope](https://www.kaleidoscopeapp.com/)
255261

262+
* Is MDI: False
256263
* Supports auto-refresh: False
257264
* Supports text files: True
258265
* Supported binaries: bmp, gif, ico, jpg, jpeg, png, tiff, tif
@@ -265,6 +272,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
265272

266273
### [KDiff3](https://github.com/KDE/kdiff3)
267274

275+
* Is MDI: False
268276
* Supports auto-refresh: False
269277
* Supports text files: True
270278

@@ -289,6 +297,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
289297

290298
### [Neovim](https://neovim.io/)
291299

300+
* Is MDI: False
292301
* Supports auto-refresh: False
293302
* Supports text files: True
294303

@@ -304,6 +313,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
304313

305314
### [P4Merge](https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge)
306315

316+
* Is MDI: False
307317
* Supports auto-refresh: False
308318
* Supports text files: True
309319
* Supported binaries: bmp, gif, jpg, jpeg, png, pbm, pgm, ppm, tif, tiff, xbm, xpm
@@ -330,6 +340,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
330340

331341
### [Rider](https://www.jetbrains.com/rider/)
332342

343+
* Is MDI: False
333344
* Supports auto-refresh: False
334345
* Supports text files: True
335346

@@ -371,6 +382,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
371382

372383
### [TkDiff](https://sourceforge.net/projects/tkdiff/)
373384

385+
* Is MDI: False
374386
* Supports auto-refresh: False
375387
* Supports text files: True
376388

@@ -382,6 +394,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
382394

383395
### [TortoiseGitMerge](https://tortoisegit.org/docs/tortoisegitmerge/)
384396

397+
* Is MDI: False
385398
* Supports auto-refresh: False
386399
* Supports text files: True
387400

@@ -397,6 +410,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
397410

398411
### [TortoiseIDiff](https://tortoisesvn.net/TortoiseIDiff.html)
399412

413+
* Is MDI: False
400414
* Supports auto-refresh: False
401415
* Supports text files: False
402416
* Supported binaries: bmp, gif, ico, jpg, jpeg, png, tif, tiff
@@ -413,6 +427,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
413427

414428
### [TortoiseMerge](https://tortoisesvn.net/TortoiseMerge.html)
415429

430+
* Is MDI: False
416431
* Supports auto-refresh: False
417432
* Supports text files: True
418433

@@ -428,6 +443,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
428443

429444
### [Vim](https://www.vim.org/)
430445

446+
* Is MDI: False
431447
* Supports auto-refresh: True
432448
* Supports text files: True
433449

@@ -456,6 +472,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
456472

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

475+
* Is MDI: False
459476
* Supports auto-refresh: True
460477
* Supports text files: True
461478

@@ -484,6 +501,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
484501

485502
### [AraxisMerge](https://www.araxis.com/merge)
486503

504+
* Is MDI: True
487505
* Supports auto-refresh: True
488506
* Supports text files: True
489507
* Supported binaries: bmp, dib, emf, gif, jif, j2c, j2k, jp2, jpc, jpeg, jpg, jpx, pbm, pcx, pgm, png, ppm, ras, tif, tiff, tga, wmf
@@ -512,6 +530,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
512530

513531
### [CodeCompare](https://www.devart.com/codecompare/)
514532

533+
* Is MDI: True
515534
* Supports auto-refresh: False
516535
* Supports text files: True
517536

@@ -531,6 +550,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
531550

532551
### [Meld](https://meldmerge.org/)
533552

553+
* Is MDI: True
534554
* Supports auto-refresh: False
535555
* Supports text files: True
536556

@@ -560,6 +580,7 @@ While Meld is not MDI, it is treated as MDI since it uses a single shared proces
560580

561581
### [SublimeMerge](https://www.sublimemerge.com/)
562582

583+
* Is MDI: True
563584
* Supports auto-refresh: False
564585
* Supports text files: True
565586

@@ -588,6 +609,7 @@ While SublimeMerge is not MDI, it is treated as MDI since it uses a single share
588609

589610
### [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff)
590611

612+
* Is MDI: True
591613
* Supports auto-refresh: True
592614
* Supports text files: True
593615

@@ -604,6 +626,7 @@ While SublimeMerge is not MDI, it is treated as MDI since it uses a single share
604626

605627
### [VisualStudioCode](https://code.visualstudio.com)
606628

629+
* Is MDI: True
607630
* Supports auto-refresh: True
608631
* Supports text files: True
609632

‎src/DiffEngine.Tests/DefinitionsTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ static void AddTool(StreamWriter writer, Definition tool)
8282
### [{tool.Tool}]({tool.Url})");
8383

8484
writer.WriteLine($@"
85+
* Is MDI: {tool.IsMdi}
8586
* Supports auto-refresh: {tool.AutoRefresh}
8687
* Supports text files: {tool.SupportsText}");
8788

‎src/DiffEngine.Tests/diffTools.include.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
99

1010
### [BeyondCompare](https://www.scootersoftware.com)
1111

12+
* Is MDI: False
1213
* Supports auto-refresh: True
1314
* Supports text files: True
1415
* Supported binaries: mp3, xls, xlsm, xlsx, doc, docm, docx, dot, dotm, dotx, pdf, bmp, gif, ico, jpg, jpeg, png, tif, tiff, rtf
@@ -39,6 +40,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
3940

4041
### [DeltaWalker](https://www.deltawalker.com/)
4142

43+
* Is MDI: False
4244
* Supports auto-refresh: False
4345
* Supports text files: True
4446
* 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
@@ -60,6 +62,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
6062

6163
### [Diffinity](https://truehumandesign.se/s_diffinity.php)
6264

65+
* Is MDI: False
6366
* Supports auto-refresh: True
6467
* Supports text files: True
6568

@@ -80,6 +83,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
8083

8184
### [DiffMerge](https://www.sourcegear.com/diffmerge/)
8285

86+
* Is MDI: False
8387
* Supports auto-refresh: False
8488
* Supports text files: True
8589

@@ -105,6 +109,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
105109

106110
### [ExamDiff](https://www.prestosoft.com/edp_examdiffpro.asp)
107111

112+
* Is MDI: False
108113
* Supports auto-refresh: True
109114
* Supports text files: True
110115

@@ -126,6 +131,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
126131

127132
### [Guiffy](https://www.guiffy.com/)
128133

134+
* Is MDI: False
129135
* Supports auto-refresh: False
130136
* Supports text files: True
131137
* Supported binaries: bmp, gif, jpeg, jpg, png, wbmp
@@ -153,6 +159,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
153159

154160
### [Kaleidoscope](https://www.kaleidoscopeapp.com/)
155161

162+
* Is MDI: False
156163
* Supports auto-refresh: False
157164
* Supports text files: True
158165
* Supported binaries: bmp, gif, ico, jpg, jpeg, png, tiff, tif
@@ -165,6 +172,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
165172

166173
### [KDiff3](https://github.com/KDE/kdiff3)
167174

175+
* Is MDI: False
168176
* Supports auto-refresh: False
169177
* Supports text files: True
170178

@@ -189,6 +197,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
189197

190198
### [Neovim](https://neovim.io/)
191199

200+
* Is MDI: False
192201
* Supports auto-refresh: False
193202
* Supports text files: True
194203

@@ -204,6 +213,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
204213

205214
### [P4Merge](https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge)
206215

216+
* Is MDI: False
207217
* Supports auto-refresh: False
208218
* Supports text files: True
209219
* Supported binaries: bmp, gif, jpg, jpeg, png, pbm, pgm, ppm, tif, tiff, xbm, xpm
@@ -230,6 +240,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
230240

231241
### [Rider](https://www.jetbrains.com/rider/)
232242

243+
* Is MDI: False
233244
* Supports auto-refresh: False
234245
* Supports text files: True
235246

@@ -271,6 +282,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
271282

272283
### [TkDiff](https://sourceforge.net/projects/tkdiff/)
273284

285+
* Is MDI: False
274286
* Supports auto-refresh: False
275287
* Supports text files: True
276288

@@ -282,6 +294,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
282294

283295
### [TortoiseGitMerge](https://tortoisegit.org/docs/tortoisegitmerge/)
284296

297+
* Is MDI: False
285298
* Supports auto-refresh: False
286299
* Supports text files: True
287300

@@ -297,6 +310,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
297310

298311
### [TortoiseIDiff](https://tortoisesvn.net/TortoiseIDiff.html)
299312

313+
* Is MDI: False
300314
* Supports auto-refresh: False
301315
* Supports text files: False
302316
* Supported binaries: bmp, gif, ico, jpg, jpeg, png, tif, tiff
@@ -313,6 +327,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
313327

314328
### [TortoiseMerge](https://tortoisesvn.net/TortoiseMerge.html)
315329

330+
* Is MDI: False
316331
* Supports auto-refresh: False
317332
* Supports text files: True
318333

@@ -328,6 +343,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
328343

329344
### [Vim](https://www.vim.org/)
330345

346+
* Is MDI: False
331347
* Supports auto-refresh: True
332348
* Supports text files: True
333349

@@ -356,6 +372,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
356372

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

375+
* Is MDI: False
359376
* Supports auto-refresh: True
360377
* Supports text files: True
361378

@@ -384,6 +401,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
384401

385402
### [AraxisMerge](https://www.araxis.com/merge)
386403

404+
* Is MDI: True
387405
* Supports auto-refresh: True
388406
* Supports text files: True
389407
* Supported binaries: bmp, dib, emf, gif, jif, j2c, j2k, jp2, jpc, jpeg, jpg, jpx, pbm, pcx, pgm, png, ppm, ras, tif, tiff, tga, wmf
@@ -412,6 +430,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
412430

413431
### [CodeCompare](https://www.devart.com/codecompare/)
414432

433+
* Is MDI: True
415434
* Supports auto-refresh: False
416435
* Supports text files: True
417436

@@ -431,6 +450,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
431450

432451
### [Meld](https://meldmerge.org/)
433452

453+
* Is MDI: True
434454
* Supports auto-refresh: False
435455
* Supports text files: True
436456

@@ -460,6 +480,7 @@ While Meld is not MDI, it is treated as MDI since it uses a single shared proces
460480

461481
### [SublimeMerge](https://www.sublimemerge.com/)
462482

483+
* Is MDI: True
463484
* Supports auto-refresh: False
464485
* Supports text files: True
465486

@@ -488,6 +509,7 @@ While SublimeMerge is not MDI, it is treated as MDI since it uses a single share
488509

489510
### [VisualStudio](https://docs.microsoft.com/en-us/visualstudio/ide/reference/diff)
490511

512+
* Is MDI: True
491513
* Supports auto-refresh: True
492514
* Supports text files: True
493515

@@ -504,6 +526,7 @@ While SublimeMerge is not MDI, it is treated as MDI since it uses a single share
504526

505527
### [VisualStudioCode](https://code.visualstudio.com)
506528

529+
* Is MDI: True
507530
* Supports auto-refresh: True
508531
* Supports text files: True
509532

0 commit comments

Comments
 (0)