remove DiffMerge support (#369)

not updated since October 2013

Author: SimonCropp

docs/diff-tool.md

@@ -208,43 +208,6 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
     * `%ProgramW6432%\Diffinity\Diffinity.exe`
     * `%ProgramFiles(x86)%\Diffinity\Diffinity.exe`
 
-### [DiffMerge](https://www.sourcegear.com/diffmerge/)
-
-  * Cost: Free
-  * Is MDI: False
-  * Supports auto-refresh: True
-  * Supports text files: True
-  * Environment variable for custom install location: `DiffEngine_DiffMerge`
-
-#### Notes:
-
- * Ensure [Check for Modified Files](https://www.sourcegear.com/diffmerge/webhelp/sec__opt__filewindows.html) is enabled
-
-#### Windows settings:
-
-  * Example target on left arguments: `--nosplash "targetFile.txt" "tempFile.txt" `
-  * Example target on right arguments: `--nosplash "tempFile.txt" "targetFile.txt" `
-  * Scanned paths:  
-    * `%PATH%sgdm.exe`
-    * `%ProgramFiles%\SourceGear\Common\DiffMerge\sgdm.exe`
-    * `%ProgramW6432%\SourceGear\Common\DiffMerge\sgdm.exe`
-    * `%ProgramFiles(x86)%\SourceGear\Common\DiffMerge\sgdm.exe`
-
-#### OSX settings:
-
-  * Example target on left arguments: `--nosplash "targetFile.txt" "tempFile.txt" `
-  * Example target on right arguments: `--nosplash "tempFile.txt" "targetFile.txt" `
-  * Scanned paths:  
-    * `%PATH%DiffMerge`
-    * `/Applications/DiffMerge.app/Contents/MacOS/DiffMerge`
-
-#### Linux settings:
-
-  * Example target on left arguments: `--nosplash "targetFile.txt" "tempFile.txt" `
-  * Example target on right arguments: `--nosplash "tempFile.txt" "targetFile.txt" `
-  * Scanned paths:  
-    * `%PATH%diffmerge`
-
 ### [ExamDiff](https://www.prestosoft.com/edp_examdiffpro.asp)
 
   * Cost: Paid

docs/diff-tool.order.md

@@ -15,7 +15,6 @@ To change this file edit the source file and then run MarkdownSnippets.
  * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
  * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
  * **[WinMerge](/docs/diff-tool.md#winmerge)** Win (Cost: Free with option to donate)
- * **[DiffMerge](/docs/diff-tool.md#diffmerge)** Win/OSX/Linux (Cost: Free)
  * **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Win (Cost: Free)
  * **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Win (Cost: Free)
  * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Win (Cost: Free)

readme.md

@@ -53,7 +53,6 @@ DiffEngine manages launching and cleanup of diff tools. It is designed to be use
  * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
  * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
  * **[WinMerge](/docs/diff-tool.md#winmerge)** Win (Cost: Free with option to donate)
- * **[DiffMerge](/docs/diff-tool.md#diffmerge)** Win/OSX/Linux (Cost: Free)
  * **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Win (Cost: Free)
  * **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Win (Cost: Free)
  * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Win (Cost: Free)

src/DiffEngine.Tests/defaultOrder.include.md

@@ -3,7 +3,6 @@
  * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
  * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
  * **[WinMerge](/docs/diff-tool.md#winmerge)** Win (Cost: Free with option to donate)
- * **[DiffMerge](/docs/diff-tool.md#diffmerge)** Win/OSX/Linux (Cost: Free)
  * **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Win (Cost: Free)
  * **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Win (Cost: Free)
  * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Win (Cost: Free)

src/DiffEngine.Tests/diffToolList.include.md

@@ -3,7 +3,6 @@
  * **[Kaleidoscope](/docs/diff-tool.md#kaleidoscope)** OSX (Cost: Paid)
  * **[DeltaWalker](/docs/diff-tool.md#deltawalker)** Win/OSX (Cost: Paid)
  * **[WinMerge](/docs/diff-tool.md#winmerge)** Win (Cost: Free with option to donate)
- * **[DiffMerge](/docs/diff-tool.md#diffmerge)** Win/OSX/Linux (Cost: Free)
  * **[TortoiseGitMerge](/docs/diff-tool.md#tortoisegitmerge)** Win (Cost: Free)
  * **[TortoiseGitIDiff](/docs/diff-tool.md#tortoisegitidiff)** Win (Cost: Free)
  * **[TortoiseMerge](/docs/diff-tool.md#tortoisemerge)** Win (Cost: Free)

src/DiffEngine.Tests/diffTools.include.md

@@ -95,43 +95,6 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
     * `%ProgramW6432%\Diffinity\Diffinity.exe`
     * `%ProgramFiles(x86)%\Diffinity\Diffinity.exe`
 
-### [DiffMerge](https://www.sourcegear.com/diffmerge/)
-
-  * Cost: Free
-  * Is MDI: False
-  * Supports auto-refresh: True
-  * Supports text files: True
-  * Environment variable for custom install location: `DiffEngine_DiffMerge`
-
-#### Notes:
-
- * Ensure [Check for Modified Files](https://www.sourcegear.com/diffmerge/webhelp/sec__opt__filewindows.html) is enabled
-
-#### Windows settings:
-
-  * Example target on left arguments: `--nosplash "targetFile.txt" "tempFile.txt" `
-  * Example target on right arguments: `--nosplash "tempFile.txt" "targetFile.txt" `
-  * Scanned paths:  
-    * `%PATH%sgdm.exe`
-    * `%ProgramFiles%\SourceGear\Common\DiffMerge\sgdm.exe`
-    * `%ProgramW6432%\SourceGear\Common\DiffMerge\sgdm.exe`
-    * `%ProgramFiles(x86)%\SourceGear\Common\DiffMerge\sgdm.exe`
-
-#### OSX settings:
-
-  * Example target on left arguments: `--nosplash "targetFile.txt" "tempFile.txt" `
-  * Example target on right arguments: `--nosplash "tempFile.txt" "targetFile.txt" `
-  * Scanned paths:  
-    * `%PATH%DiffMerge`
-    * `/Applications/DiffMerge.app/Contents/MacOS/DiffMerge`
-
-#### Linux settings:
-
-  * Example target on left arguments: `--nosplash "targetFile.txt" "tempFile.txt" `
-  * Example target on right arguments: `--nosplash "tempFile.txt" "targetFile.txt" `
-  * Scanned paths:  
-    * `%PATH%diffmerge`
-
 ### [ExamDiff](https://www.prestosoft.com/edp_examdiffpro.asp)
 
   * Cost: Paid

src/DiffEngine/Definitions.cs

@@ -12,7 +12,6 @@ static Definitions() =>
             Implementation.Kaleidoscope(),
             Implementation.DeltaWalker(),
             Implementation.WinMerge(),
-            Implementation.DiffMerge(),
             Implementation.TortoiseGitMerge(),
             Implementation.TortoiseGitIDiff(),
             Implementation.TortoiseMerge(),

src/DiffEngine/DiffTool.cs

@@ -7,7 +7,6 @@ public enum DiffTool
     Kaleidoscope,
     DeltaWalker,
     WinMerge,
-    DiffMerge,
     TortoiseMerge,
     TortoiseGitMerge,
     TortoiseGitIDiff,