We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 45df27a commit c168437Copy full SHA for c168437
cmd/upgrade.go
@@ -124,8 +124,12 @@ func newChartCommand() *cobra.Command {
124
diff.useUpgradeDryRun = os.Getenv("HELM_DIFF_USE_UPGRADE_DRY_RUN") == "true"
125
126
if !diff.threeWayMerge && !cmd.Flags().Changed("three-way-merge") {
127
- println("reading three way merge from env")
128
- diff.threeWayMerge = os.Getenv("HELM_DIFF_THREE_WAY_MERGE") == "true"
+ enabled := os.Getenv("HELM_DIFF_THREE_WAY_MERGE") == "true"
+ diff.threeWayMerge = enabled
129
+
130
+ if enabled {
131
+ fmt.Println("Enabled three way merge via the envvar")
132
+ }
133
}
134
135
if q, _ := cmd.Flags().GetBool("suppress-secrets"); q {
0 commit comments