From 969ea4a56d60d1b03eb23897b92f5410709f2511 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 10 May 2016 15:56:05 -0700 Subject: [PATCH] Because --merge --diff seems clunky --- DATabase/DATabase.cs | 2 +- SabreHelper/Build.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index 931f433a..198908e8 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -430,7 +430,7 @@ namespace SabreTools } // 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); } diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs index fc297fad..e07ebc2e 100644 --- a/SabreHelper/Build.cs +++ b/SabreHelper/Build.cs @@ -118,7 +118,7 @@ Options: -lsy, --list-systems List all systems (id <= name) -m, --merge Merge one or more DATs -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 -b, --bare Don't include date in file name -u, --unzip Force unzipping in created DAT