Merge pull request #504 from ericzbeard/fix-501

Add node-style to merge

internal/cmd/merge/merge.go

@@ -59,4 +59,5 @@ var Cmd = &cobra.Command{
 func init() {
 	Cmd.Flags().StringVarP(&outFn, "output", "o", "", "Output merged template to a file")
 	Cmd.Flags().BoolVarP(&forceMerge, "force", "f", false, "Don't warn on clashing attributes; rename them instead. Note: this will not rename Refs, GetAtts, etc.")
+	Cmd.Flags().StringVar(&format.NodeStyle, "node-style", "", format.NodeStyleDocs)
 }

test/templates/merge1.yaml

@@ -0,0 +1,8 @@
+Parameters:
+  Bar:
+    Type: String
+
+Resources:
+  Bucket:
+    Type: AWS::S3::Bucket
+

test/templates/merge2.yaml

@@ -0,0 +1,11 @@
+Parameters:
+  Foo:
+    Type: String
+
+Resources:
+  MyEventBridgeSchedule:
+    Type: AWS::Scheduler::Schedule
+    Properties:
+      FlexibleTimeWindow:
+        Mode: "OFF"
+