Skip to content

Commit 5b0fb0f

Browse files
committed
Docs changes
1 parent 4dcbe74 commit 5b0fb0f

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

docs/diff-tool.order.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +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)
36-
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Win (Cost: Free)<!-- 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 -->
3737

3838

3939
## Custom order

readme.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,30 +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)
89-
* **[MsWordDiff](/docs/diff-tool.md#msworddiff)** Win (Cost: Free)<!-- 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 -->
9090

9191

9292
## Launching a tool

0 commit comments

Comments
 (0)