diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-11-07 10:48:38 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-11-07 10:48:38 -0800 |
| commit | 9c7f75afb5d4e50ac915213eba0470c2d0ad304d (patch) | |
| tree | e6c9e0e66d8cd9458ccaf2104abfb22946652bf5 /src/Text/Pandoc/App | |
| parent | e299212bf766cdbeec43be90f634038ab4a727c1 (diff) | |
| download | pandoc-9c7f75afb5d4e50ac915213eba0470c2d0ad304d.tar.gz | |
Change merge behavior for metadata.
Previously, if a document contained two YAML metadata blocks
that set the same field, the conflict would be resolved in favor
of the first. Now it is resolved in favor of the second (due to
a change in pandoc-types).
This makes the behavior more uniform with other things in pandoc
(such as reference links and `--metadata-file`).
Diffstat (limited to 'src/Text/Pandoc/App')
| -rw-r--r-- | src/Text/Pandoc/App/CommandLineOptions.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs index 7692cfac9..9f1905741 100644 --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -155,7 +155,7 @@ options = , Option "" ["metadata-file"] (ReqArg (\arg opt -> return opt{ optMetadataFiles = - normalizePath arg : optMetadataFiles opt }) + optMetadataFiles opt ++ [normalizePath arg] }) "FILE") "" |