diff --git a/DiffDat/DiffDat.cs b/DiffDat/MergeDAT.cs
similarity index 98%
rename from DiffDat/DiffDat.cs
rename to DiffDat/MergeDAT.cs
index 4f61c854..783eb36b 100644
--- a/DiffDat/DiffDat.cs
+++ b/DiffDat/MergeDAT.cs
@@ -6,7 +6,7 @@ using SabreTools.Helper;
namespace SabreTools
{
- public class DiffDat
+ public class MergeDAT
{
private static Logger logger;
diff --git a/DiffDat/DiffDat.csproj b/DiffDat/MergeDAT.csproj
similarity index 98%
rename from DiffDat/DiffDat.csproj
rename to DiffDat/MergeDAT.csproj
index 8adb5e6f..f8071f22 100644
--- a/DiffDat/DiffDat.csproj
+++ b/DiffDat/MergeDAT.csproj
@@ -43,7 +43,7 @@
-
+
diff --git a/README.MD b/README.MD
index 9ea9f919..8ede048e 100644
--- a/README.MD
+++ b/README.MD
@@ -67,24 +67,21 @@ This section is for tools that have been requested for a highly specific purpose
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.
-DiffDat
+MergeDAT
-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
- Read in from commandline, drag-and-drop, a directory, or any combination
- Roms are compared with all information available, so duplicates can exist in the output
- Output type automatically determined by the first input file
- - Merge the output DAT so no partial duplicates are included
+ - Optionally create a DiffDat of the inputted files instead of a straight merge
+ - Optionally merge the output DAT so no partial duplicates are included
DatToMiss
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.
-MergeDAT
-
-CURRENTLY UNCODED - A program to merge an arbitrary number of DATs into a single file and optionally dedupe the resulting set of roms.
-
Licensing
The preceeding programs use, in part or in whole, code, libraries, and/or applications from the 7-zip project. 7-zip is licenced under the GNU LGPL.
diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs
index 690df534..558bb30f 100644
--- a/SabreHelper/Build.cs
+++ b/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":
diff --git a/SabreTools.sln b/SabreTools.sln
index 9b700a04..568ddd99 100644
--- a/SabreTools.sln
+++ b/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