Skip to content

Commit

Permalink
fix definitions order
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Jun 3, 2021
1 parent a1543dc commit a353ec5
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions docs/diff-tool.order.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ To change this file edit the source file and then run MarkdownSnippets.

* [BeyondCompare](/docs/diff-tool.md#beyondcompare) <!-- include: defaultOrder. path: /src/DiffEngine.Tests/defaultOrder.include.md -->
* [P4Merge](/docs/diff-tool.md#p4merge)
* [AraxisMerge](/docs/diff-tool.md#araxismerge)
* [Meld](/docs/diff-tool.md#meld)
* [SublimeMerge](/docs/diff-tool.md#sublimemerge)
* [Kaleidoscope](/docs/diff-tool.md#kaleidoscope)
* [DeltaWalker](/docs/diff-tool.md#deltawalker)
* [CodeCompare](/docs/diff-tool.md#codecompare)
* [WinMerge](/docs/diff-tool.md#winmerge)
* [DiffMerge](/docs/diff-tool.md#diffmerge)
* [TortoiseMerge](/docs/diff-tool.md#tortoisemerge)
Expand All @@ -28,11 +24,15 @@ To change this file edit the source file and then run MarkdownSnippets.
* [Guiffy](/docs/diff-tool.md#guiffy)
* [ExamDiff](/docs/diff-tool.md#examdiff)
* [Diffinity](/docs/diff-tool.md#diffinity)
* [VisualStudioCode](/docs/diff-tool.md#visualstudiocode)
* [VisualStudio](/docs/diff-tool.md#visualstudio)
* [Rider](/docs/diff-tool.md#rider)
* [Vim](/docs/diff-tool.md#vim)
* [Neovim](/docs/diff-tool.md#neovim) <!-- endInclude -->
* [Neovim](/docs/diff-tool.md#neovim)
* [AraxisMerge](/docs/diff-tool.md#araxismerge)
* [Meld](/docs/diff-tool.md#meld)
* [SublimeMerge](/docs/diff-tool.md#sublimemerge)
* [CodeCompare](/docs/diff-tool.md#codecompare)
* [VisualStudioCode](/docs/diff-tool.md#visualstudiocode)
* [VisualStudio](/docs/diff-tool.md#visualstudio) <!-- endInclude -->


## Custom order
Expand Down
12 changes: 6 additions & 6 deletions src/DiffEngine.Tests/defaultOrder.include.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
* [BeyondCompare](/docs/diff-tool.md#beyondcompare)
* [P4Merge](/docs/diff-tool.md#p4merge)
* [AraxisMerge](/docs/diff-tool.md#araxismerge)
* [Meld](/docs/diff-tool.md#meld)
* [SublimeMerge](/docs/diff-tool.md#sublimemerge)
* [Kaleidoscope](/docs/diff-tool.md#kaleidoscope)
* [DeltaWalker](/docs/diff-tool.md#deltawalker)
* [CodeCompare](/docs/diff-tool.md#codecompare)
* [WinMerge](/docs/diff-tool.md#winmerge)
* [DiffMerge](/docs/diff-tool.md#diffmerge)
* [TortoiseMerge](/docs/diff-tool.md#tortoisemerge)
Expand All @@ -16,8 +12,12 @@
* [Guiffy](/docs/diff-tool.md#guiffy)
* [ExamDiff](/docs/diff-tool.md#examdiff)
* [Diffinity](/docs/diff-tool.md#diffinity)
* [VisualStudioCode](/docs/diff-tool.md#visualstudiocode)
* [VisualStudio](/docs/diff-tool.md#visualstudio)
* [Rider](/docs/diff-tool.md#rider)
* [Vim](/docs/diff-tool.md#vim)
* [Neovim](/docs/diff-tool.md#neovim)
* [AraxisMerge](/docs/diff-tool.md#araxismerge)
* [Meld](/docs/diff-tool.md#meld)
* [SublimeMerge](/docs/diff-tool.md#sublimemerge)
* [CodeCompare](/docs/diff-tool.md#codecompare)
* [VisualStudioCode](/docs/diff-tool.md#visualstudiocode)
* [VisualStudio](/docs/diff-tool.md#visualstudio)
14 changes: 7 additions & 7 deletions src/DiffEngine/Definitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@ static Definitions()
{
Implementation.BeyondCompare(),
Implementation.P4Merge(),
Implementation.AraxisMerge(),
Implementation.Meld(),
Implementation.SublimeMerge(),
Implementation.Kaleidoscope(),
Implementation.DeltaWalker(),
Implementation.CodeCompare(),
Implementation.WinMerge(),
Implementation.DiffMerge(),
Implementation.TortoiseMerge(),
Expand All @@ -26,11 +22,15 @@ static Definitions()
Implementation.Guiffy(),
Implementation.ExamDiff(),
Implementation.Diffinity(),
Implementation.VsCode(),
Implementation.VisualStudio(),
Implementation.Rider(),
Implementation.Vim(),
Implementation.Neovim()
Implementation.Neovim(),
Implementation.AraxisMerge(),
Implementation.Meld(),
Implementation.SublimeMerge(),
Implementation.CodeCompare(),
Implementation.VsCode(),
Implementation.VisualStudio(),
};
}
}

0 comments on commit a353ec5

Please sign in to comment.