Skip to content

Commit

Permalink
Fix grammar
Browse files Browse the repository at this point in the history
  • Loading branch information
twpayne committed Aug 4, 2021
1 parent 47a1b22 commit 49e9b46
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions docs/REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -1191,10 +1191,11 @@ or an encrypted file that cannot be decrypted) a two-way merge is performed
instead.

The order of arguments to `merge.command` is controlled by `merge.args`. Each
argument is interpreted a template with the variables `.Destination`, `.Source`,
and `.Target` available corresponding to the path of the file in the destination
state, the source state, and the target state respectively. The default value of
`merge.args` is `["{{ .Destination }}", "{{ .Source }}", "{{ .Target }}"]`.
argument is interpreted as a template with the variables `.Destination`,
`.Source`, and `.Target` available corresponding to the path of the file in the
destination state, the source state, and the target state respectively. The
default value of `merge.args` is `["{{ .Destination }}", "{{ .Source }}", "{{
.Target }}"]`.

#### `merge` examples

Expand Down

0 comments on commit 49e9b46

Please sign in to comment.