summaryrefslogtreecommitdiff
path: root/docs/modules/Config.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/modules/Config.html')
-rw-r--r--docs/modules/Config.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/modules/Config.html b/docs/modules/Config.html
index 213b179..d8ca29f 100644
--- a/docs/modules/Config.html
+++ b/docs/modules/Config.html
@@ -116,6 +116,10 @@
<a href="../modules/git2.html">git2</a>
</li>
+ <li>
+ <a href="../modules/merge.html">merge</a>
+ </li>
+
</ul>