diff options
Diffstat (limited to 'AppleDocWizard/AppleDocHandler.cs')
| -rw-r--r-- | AppleDocWizard/AppleDocHandler.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/AppleDocWizard/AppleDocHandler.cs b/AppleDocWizard/AppleDocHandler.cs index 256e485..e36c8bb 100644 --- a/AppleDocWizard/AppleDocHandler.cs +++ b/AppleDocWizard/AppleDocHandler.cs @@ -134,6 +134,8 @@ namespace macdoc statusFile = Path.Combine (statusFile, "merge.status"); if (!File.Exists (statusFile)) return true; + if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("APPLEDOCWIZARD_FORCE_MERGE"))) + return true; var mergedVersion = CloneFillWithZeros (new Version (File.ReadAllText (statusFile))); |