Rename DiffDat to MergeDAT

DiffDat/MergeDAT.cs

@@ -6,7 +6,7 @@ using SabreTools.Helper;
 
 namespace SabreTools
 {
-	public class DiffDat
+	public class MergeDAT
 	{
 		private static Logger logger;
 

DiffDat/MergeDAT.csproj

@@ -43,7 +43,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DiffDat.cs" />
+    <Compile Include="MergeDAT.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

README.MD

@@ -67,24 +67,21 @@ This section is for tools that have been requested for a highly specific purpose
 <p/>
 Experimental tool for trimming all files in DAT (or folder of DATs) so that they fall within the path size limits of NTFS. By default, it also merges all games into a single, minimally-named game for uncompressed sets.
 
-<b>DiffDat</b>
+<b>MergeDAT</b>
 <p/>
-A program to create a DAT based on the differences between two or more input DATs.
+A program to merge (or diff) an arbitrary number of DATs
 <ul>
 	<li>Read in from commandline, drag-and-drop, a directory, or any combination</li>
 	<li>Roms are compared with all information available, so duplicates can exist in the output</li>
 	<li>Output type automatically determined by the first input file</li>
-	<li>Merge the output DAT so no partial duplicates are included</li>
+	<li>Optionally create a DiffDat of the inputted files instead of a straight merge</li>
+	<li>Optionally merge the output DAT so no partial duplicates are included</li>
 </ul>
 
 <b>DatToMiss</b>
 <p/>
 A program to convert a DAT to a miss file either for the games or the roms with the option to add a generic preface and postface to all of the outputted lines.
 
-<b>MergeDAT</b>
-<p/>
-CURRENTLY UNCODED - A program to merge an arbitrary number of DATs into a single file and optionally dedupe the resulting set of roms.
-
 <h3>Licensing</h3>
 <p/>
 The preceeding programs use, in part or in whole, code, libraries, and/or applications from the <a href="www.7-zip.org">7-zip project</a>. 7-zip is licenced under the GNU LGPL.<br/>

SabreHelper/Build.cs

@@ -156,14 +156,15 @@ Options:
   -l, --log		Enable log to file
   -sd, --superdat	Enable SuperDAT creation");
 					break;
-				case "DiffDat":
-					Console.WriteLine(@"DiffDat - Get the difference between two or more DAT files
+				case "MergeDAT":
+					Console.WriteLine(@"MergeDAT - Merge or diff two or more files
 -----------------------------------------
 Usage: DiffDat [options] [filename] [filename] ...
 
 Options:
   -h, -?, --help	Show this help dialog
   -l, --log		Enable log to file
+  -d, --diff		Enable diff creation
   -m, --merge	Enable merging in the created DAT");
 					break;
 				case "DatToMiss":

SabreTools.sln

@@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreHelper", "SabreHelper\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DATFromDir", "DATFromDir\DATFromDir.csproj", "{382B75D3-079E-49D5-A830-54DD6EB5A02D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiffDat", "DiffDat\DiffDat.csproj", "{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MergeDAT", "DiffDat\MergeDAT.csproj", "{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatToMiss", "DatToMiss\DatToMiss.csproj", "{5AB8A989-21FC-4491-B8DB-E0C5B3983896}"
 EndProject