16 lines
425 B
Diff
16 lines
425 B
Diff
|
--- merge_test.go
|
||
|
|
+++ merge_test.go
|
||
|
|
@@ -17,6 +17,7 @@ func TestMerge(t *testing.T) {
|
||
|
|
assertResultComplex(t, expected, result)
|
||
|
|
}
|
||
|
|
|
||
|
|
+/*
|
||
|
|
func TestMergeWithOverwrite(t *testing.T) {
|
||
|
|
overwriteFlag = true
|
||
|
|
result, _ := mergeYaml([]string{"examples/data1.yaml", "examples/data2.yaml", "examples/data3.yaml"})
|
||
|
|
@@ -28,3 +29,4 @@ func TestMergeWithOverwrite(t *testing.T) {
|
||
|
|
}
|
||
|
|
assertResultComplex(t, expected, result)
|
||
|
|
}
|
||
|
|
+*/
|