merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index 61e2cbbebc21e95ba76edf7f21335c2f606f6cb9..7477ce8fa8e5185cfbd74a31b8d5accd18216a1b 100644 (file)
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@ -49,15 +49,18 @@ OPTIONS
        linkgit:git-web{litdd}browse[1] for more information about this. If
        the script fails, the URL will be printed to stdout.
 
+start::
 --start::
        Start the httpd instance and exit.  This does not generate
        any of the configuration files for spawning a new instance.
 
+stop::
 --stop::
        Stop the httpd instance and exit.  This does not generate
        any of the configuration files for spawning a new instance,
        nor does it close the browser.
 
+restart::
 --restart::
        Restart the httpd instance and exit.  This does not generate
        any of the configuration files for spawning a new instance.