score_trees(): fix iteration over trees with missing entries

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index df3ea3779be369ce0f935cfac945e79f08ff4b5a..12b6bbf591ee801e0723f59db0e0abe7dc88ec73 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -26,6 +26,10 @@ merge.ff::
        allowed (equivalent to giving the `--ff-only` option from the
        command line).
 
+merge.verifySignatures::
+       If true, this is equivalent to the --verify-signatures command
+       line option. See linkgit:git-merge[1] for details.
+
 include::fmt-merge-msg-config.txt[]
 
 merge.renameLimit::