oneway_merge(): only lstat() when told to update worktree

diff --git a/Documentation/user-manual.conf b/Documentation/user-manual.conf
index 92b01ecf715f216bf79e3f775813d1df66000c7e..d87294de2f54c354c6215fb6029a182c966d6b2e 100644 (file)
--- a/Documentation/user-manual.conf
+++ b/Documentation/user-manual.conf
@@ -7,14 +7,14 @@ startsb=[
 endsb=]
 tilde=~
 
-[gitlink-inlinemacro]
+[linkgit-inlinemacro]
 <ulink url="{target}.html">{target}{0?({0})}</ulink>
 
 ifdef::backend-docbook[]
 # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
 [listingblock]
 <example><title>{title}</title>
-<literallayout>
+<literallayout class="monospaced">
 |
 </literallayout>
 {title#}</example>