Skip to content

Commit 4fca5f7

Browse files
committed
Docs changes
1 parent f61bb80 commit 4fca5f7

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

docs/diff-tool.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If a tool is running for the comparison of the current verification (per test),
3939
| false | true | Open new instance. Previous instance must be manually closed |
4040
| false | false | Kill current and open new instance |
4141

42-
This allows, in most cases, for no manual closing of the tool to be required. <!-- singleLineInclude: diffToolCleanup. path: /docs/mdsource/diffToolCleanup.include.md -->
42+
This allows, in most cases, for no manual closing of the tool to be required.<!-- singleLineInclude: diffToolCleanup. path: /docs/mdsource/diffToolCleanup.include.md -->
4343

4444

4545
## MaxInstancesToLaunch
@@ -85,7 +85,7 @@ If a tool is running for the comparison of the current verification (per test),
8585
| true | No action taken. Previous instance must be manually closed |
8686
| false | Kill current instance |
8787

88-
This allows, in most cases, for no manual closing of the tool to be required. <!-- singleLineInclude: diffToolCleanup. path: /docs/mdsource/diffToolCleanup.include.md -->
88+
This allows, in most cases, for no manual closing of the tool to be required.<!-- singleLineInclude: diffToolCleanup. path: /docs/mdsource/diffToolCleanup.include.md -->
8989

9090

9191
## Disable orphaned process detection
@@ -111,7 +111,7 @@ ReSharper | Options | Tools | Unit Testing | Test Runner
111111

112112
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}`.
113113

114-
<!-- include: diffTools. path: /src/DiffEngine.Tests/diffTools.include.md -->
114+
<!-- include: diffTools. path: /src/DiffEngine.Tests/diffTools.include.md -->
115115
## Non-MDI tools
116116

117117
Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track and close diffs.
@@ -759,4 +759,4 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
759759
* Example target on left arguments: `--diff "targetFile.txt" "tempFile.txt" `
760760
* Example target on right arguments: `--diff "tempFile.txt" "targetFile.txt" `
761761
* Scanned paths:
762-
* `%PATH%code` <!-- endInclude -->
762+
* `%PATH%code`<!-- endInclude -->

docs/diff-tool.order.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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 -->
13+
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Win/OSX/Linux (Cost: Paid)<!-- include: defaultOrder. path: /src/DiffEngine.Tests/defaultOrder.include.md -->
1414
* **[P4Merge](/docs/diff-tool.md#p4merge)** Win/OSX/Linux (Cost: Free)
1515
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
1616
* **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
@@ -31,7 +31,7 @@ To change this file edit the source file and then run MarkdownSnippets.
3131
* **[Meld](/docs/diff-tool.md#meld)** Win/OSX/Linux (Cost: Free)
3232
* **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Win/OSX/Linux (Cost: Paid)
3333
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Win/OSX/Linux (Cost: Free)
34-
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Win (Cost: Paid and free options) <!-- endInclude -->
34+
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Win (Cost: Paid and free options)<!-- endInclude -->
3535

3636

3737
## Custom order

docs/readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ To change this file edit the source file and then run MarkdownSnippets.
77

88
# Documentation
99

10-
* [Tools](/docs/diff-tool.md) <!-- include: doc-index. path: /docs/mdsource/doc-index.include.md -->
10+
* [Tools](/docs/diff-tool.md)<!-- include: doc-index. path: /docs/mdsource/doc-index.include.md -->
1111
* [Tool Order](/docs/diff-tool.order.md)
1212
* [Custom Tool](/docs/diff-tool.custom.md)
1313
* [DiffEngineTray](/docs/tray.md)
14-
* [Code versus machine level settings](/docs/code-versus-machine-settings.md) <!-- endInclude -->
14+
* [Code versus machine level settings](/docs/code-versus-machine-settings.md)<!-- endInclude -->

readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ DiffEngine manages launching and cleanup of diff tools. It is designed to be use
3434
* [Disable for a machine/process](#disable-for-a-machineprocess)
3535
* [Disable in code](#disable-in-code)
3636
* [Icons](#icons)<!-- endToc -->
37-
* [Tools](/docs/diff-tool.md) <!-- include: doc-index. path: /docs/mdsource/doc-index.include.md -->
37+
* [Tools](/docs/diff-tool.md)<!-- include: doc-index. path: /docs/mdsource/doc-index.include.md -->
3838
* [Tool Order](/docs/diff-tool.order.md)
3939
* [Custom Tool](/docs/diff-tool.custom.md)
4040
* [DiffEngineTray](/docs/tray.md)
41-
* [Code versus machine level settings](/docs/code-versus-machine-settings.md) <!-- endInclude -->
41+
* [Code versus machine level settings](/docs/code-versus-machine-settings.md)<!-- endInclude -->
4242

4343

4444
## NuGet package
@@ -48,7 +48,7 @@ DiffEngine manages launching and cleanup of diff tools. It is designed to be use
4848

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

51-
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Win/OSX/Linux (Cost: Paid) <!-- include: diffToolList. path: /src/DiffEngine.Tests/diffToolList.include.md -->
51+
* **[BeyondCompare](/docs/diff-tool.md#beyondcompare)** Win/OSX/Linux (Cost: Paid)<!-- include: diffToolList. path: /src/DiffEngine.Tests/diffToolList.include.md -->
5252
* **[P4Merge](/docs/diff-tool.md#p4merge)** Win/OSX/Linux (Cost: Free)
5353
* **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
5454
* **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
@@ -69,7 +69,7 @@ DiffEngine manages launching and cleanup of diff tools. It is designed to be use
6969
* **[Meld](/docs/diff-tool.md#meld)** Win/OSX/Linux (Cost: Free)
7070
* **[SublimeMerge](/docs/diff-tool.md#sublimemerge)** Win/OSX/Linux (Cost: Paid)
7171
* **[VisualStudioCode](/docs/diff-tool.md#visualstudiocode)** Win/OSX/Linux (Cost: Free)
72-
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Win (Cost: Paid and free options) <!-- endInclude -->
72+
* **[VisualStudio](/docs/diff-tool.md#visualstudio)** Win (Cost: Paid and free options)<!-- endInclude -->
7373

7474

7575
## Launching a tool

0 commit comments

Comments
 (0)