rebase: implement --merge via the interactive machinery

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f394608b42c268f0f187dafabe50b718fde2a8bf..0378cd574eb01069baba14221d511f580565c0eb 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -286,10 +286,11 @@ zebra::
        are painted using either the 'color.diff.{old,new}Moved' color or
        'color.diff.{old,new}MovedAlternative'. The change between
        the two colors indicates that a new block was detected.
-dimmed_zebra::
+dimmed-zebra::
        Similar to 'zebra', but additional dimming of uninteresting parts
        of moved code is performed. The bordering lines of two adjacent
        blocks are considered interesting, the rest is uninteresting.
+       `dimmed_zebra` is a deprecated synonym.
 --
 
 --color-moved-ws=<modes>::