diff options
| author | Jeremie Laval <jeremie.laval@gmail.com> | 2012-03-14 22:55:26 +0400 |
|---|---|---|
| committer | Jeremie Laval <jeremie.laval@gmail.com> | 2012-03-14 22:56:07 +0400 |
| commit | 82bfaadfd0d4b04032b1a87aea142faf225664de (patch) | |
| tree | 5116a25f4d87c3573c4bcf89d7170cfad630aa23 /AppleDocWizard | |
| parent | bc252b08cfd53535c8d74cce19f1ac77478f04a3 (diff) | |
[AppleDocWizard] Possibly force full merge with a environment variable
Diffstat (limited to 'AppleDocWizard')
| -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))); |