suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-10 08:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change "is now used" to "is now used."

Browse Source
This commit is contained in:
neuroevolutus 2023-03-12 03:29:42 -05:00
parent 4c85100f39
commit 9df1d8f45f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/yqlib/doc/operators/multiply-merge.md
View File

@ -477,7 +477,7 @@ b: !goat
``` ```
## Custom types: clobber tags ## Custom types: clobber tags
Use the `c` option to clobber custom tags. Note that the second tag is now used Use the `c` option to clobber custom tags. Note that the second tag is now used.
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml

6
pkg/yqlib/operator_multiply_test.go
View File

@ -525,7 +525,7 @@ var multiplyOperatorScenarios = []expressionScenario{
}, },
{ {
description: "Custom types: clobber tags", description: "Custom types: clobber tags",
subdescription: "Use the `c` option to clobber custom tags. Note that the second tag is now used", subdescription: "Use the `c` option to clobber custom tags. Note that the second tag is now used.",
document: "a: !horse {cat: meow}\nb: !goat {dog: woof}", document: "a: !horse {cat: meow}\nb: !goat {dog: woof}",
expression: ".a *=c .b", expression: ".a *=c .b",
expected: []string{ expected: []string{
@ -535,7 +535,7 @@ var multiplyOperatorScenarios = []expressionScenario{
{ {
skipDoc: true, skipDoc: true,
description: "Custom types: clobber tags - *=", description: "Custom types: clobber tags - *=",
subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used", subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used.",
document: "a: !horse {cat: meow}\nb: !goat {dog: woof}", document: "a: !horse {cat: meow}\nb: !goat {dog: woof}",
expression: ".a =c .a *c .b", expression: ".a =c .a *c .b",
expected: []string{ expected: []string{
@ -545,7 +545,7 @@ var multiplyOperatorScenarios = []expressionScenario{
{ {
skipDoc: true, skipDoc: true,
description: "Custom types: dont clobber tags - *=", description: "Custom types: dont clobber tags - *=",
subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used", subdescription: "Use the `c` option to clobber custom tags - on both the `=` and `*` operator. Note that the second tag is now used.",
document: "a: !horse {cat: meow}\nb: !goat {dog: woof}", document: "a: !horse {cat: meow}\nb: !goat {dog: woof}",
expression: ".a *= .b", expression: ".a *= .b",
expected: []string{ expected: []string{