Because --merge --diff seems clunky

This commit is contained in:
Matt Nadareski
2016-05-10 15:56:05 -07:00
parent 42e1d5a8ea
commit 969ea4a56d
2 changed files with 2 additions and 2 deletions

View File

@@ -430,7 +430,7 @@ namespace SabreTools
} }
// Merge, diff, and dedupe at least 2 DATs // Merge, diff, and dedupe at least 2 DATs
else if (merge) else if (merge || diff)
{ {
InitMergeDiff(inputs, name, desc, cat, version, author, ad, diff, dedup, bare, forceunpack, old); InitMergeDiff(inputs, name, desc, cat, version, author, ad, diff, dedup, bare, forceunpack, old);
} }

View File

@@ -118,7 +118,7 @@ Options:
-lsy, --list-systems List all systems (id <= name) -lsy, --list-systems List all systems (id <= name)
-m, --merge Merge one or more DATs -m, --merge Merge one or more DATs
-ad, --all-diff Enable output of all diff variants -ad, --all-diff Enable output of all diff variants
-di, --diff Switch to diffdat mode -di, --diff Switch to diffdat mode (merge flag not required)
-dd, --dedup Enable deduping in the created DAT -dd, --dedup Enable deduping in the created DAT
-b, --bare Don't include date in file name -b, --bare Don't include date in file name
-u, --unzip Force unzipping in created DAT -u, --unzip Force unzipping in created DAT