cleanup

docs/diff-tool.custom.md

@@ -22,7 +22,7 @@ var resolvedTool = DiffTools.AddTool(
     exePath: diffToolPath,
     binaryExtensions: new[] {"jpg"})!;
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L25-L35' title='Snippet source file'>snippet source</a> | <a href='#snippet-addtool' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L24-L34' title='Snippet source file'>snippet source</a> | <a href='#snippet-addtool' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Add a tool based on existing resolved tool:
@@ -35,7 +35,7 @@ var resolvedTool = DiffTools.AddToolBasedOn(
     name: "MyCustomDiffTool",
     arguments: (temp, target) => $"\"custom args {temp}\" \"{target}\"");
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L64-L69' title='Snippet source file'>snippet source</a> | <a href='#snippet-addtoolbasedon' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L63-L68' title='Snippet source file'>snippet source</a> | <a href='#snippet-addtoolbasedon' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -63,7 +63,7 @@ var resolvedTool = DiffTools.AddToolBasedOn(
 
 await DiffRunner.LaunchAsync(resolvedTool!, "PathToTempFile", "PathToTargetFile");
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L78-L85' title='Snippet source file'>snippet source</a> | <a href='#snippet-addtoolandlaunch' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L77-L84' title='Snippet source file'>snippet source</a> | <a href='#snippet-addtoolandlaunch' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

docs/diff-tool.md

@@ -61,7 +61,7 @@ Setting the `DiffEngine_MaxInstances` environment variable to the number of inst
 ```cs
 DiffRunner.MaxInstancesToLaunch(10);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L14-L18' title='Snippet source file'>snippet source</a> | <a href='#snippet-maxinstancestolaunch' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L13-L17' title='Snippet source file'>snippet source</a> | <a href='#snippet-maxinstancestolaunch' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -320,7 +320,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
 
 #### Windows settings:
 
- * Example arguments: ` -C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
+ * Example arguments: `-C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
  * Scanned paths:
 
    * `%ProgramFiles%\Perforce\p4merge.exe`
@@ -329,12 +329,12 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
 
 #### OSX settings:
 
- * Example arguments: ` -C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
+ * Example arguments: `-C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
  * Scanned path: `/Applications/p4merge.app/Contents/MacOS/p4merge`
 
 #### Linux settings:
 
- * Example arguments: ` -C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
+ * Example arguments: `-C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
  * Scanned path: `/usr/bin/p4merge`
 
 

docs/diff-tool.order.md

@@ -52,5 +52,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
 ```cs
 DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L115-L117' title='Snippet source file'>snippet source</a> | <a href='#snippet-useorder' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L114-L116' title='Snippet source file'>snippet source</a> | <a href='#snippet-useorder' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->

src/DiffEngine.Tests/DiffToolsTest.cs

@@ -1,5 +1,4 @@
-using System.IO;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiffEngine;
 using Xunit;

src/DiffEngine.Tests/diffTools.include.md

@@ -220,7 +220,7 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
 
 #### Windows settings:
 
- * Example arguments: ` -C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
+ * Example arguments: `-C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
  * Scanned paths:
 
    * `%ProgramFiles%\Perforce\p4merge.exe`
@@ -229,12 +229,12 @@ Non-MDI tools are prefered since it allows [DiffEngineTray](tray.md) to track an
 
 #### OSX settings:
 
- * Example arguments: ` -C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
+ * Example arguments: `-C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
  * Scanned path: `/Applications/p4merge.app/Contents/MacOS/p4merge`
 
 #### Linux settings:
 
- * Example arguments: ` -C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
+ * Example arguments: `-C utf8-bom "targetFile" "tempFile" "targetFile" "targetFile"`
  * Scanned path: `/usr/bin/p4merge`
 
 

src/DiffEngine/Implementation/P4Merge.cs

@@ -5,7 +5,7 @@ static partial class Implementation
     public static Definition P4Merge()
     {
         static string Arguments(string temp, string target) =>
-            $" -C utf8-bom \"{target}\" \"{temp}\" \"{target}\" \"{target}\"";
+            $"-C utf8-bom \"{target}\" \"{temp}\" \"{target}\" \"{target}\"";
 
         return new(
             name: DiffTool.P4Merge,

src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj

@@ -17,5 +17,6 @@
     <PackageReference Include="ProjectDefaults" Version="1.0.54" PrivateAssets="All" />
     <PackageReference Include="XunitContext" Version="3.0.0" />
     <ProjectReference Include="..\DiffEngineTray\DiffEngineTray.csproj" />
+    <ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
   </ItemGroup>
 </Project>

src/DiffEngineTray.Tests/SolutionDirectoryFinderTests.Find.verified.txt

@@ -1 +1 @@
-DiffEngine
+DiffEngine