Merge branch 'en/rebase-merge-on-sequencer'

"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".

* en/rebase-merge-on-sequencer:
git-rebase.txt: update to reflect merge now implemented on sequencer

diff --combined Documentation/git-rebase.txt
index daa16403ece9f0f050da5a24086e89b181d9c0fa,29307b1340ce1ee9492e4556d7c1d0f7388f3cf6..619303adbc12e6ce48c657c8b7de76cdef7f5821
--- 1/Documentation/git-rebase.txt
--- 2/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -501,11 -501,6 +501,11 @@@ See also INCOMPATIBLE OPTIONS below
        with care: the final stash application after a successful
        rebase might result in non-trivial conflicts.
  
 +--reschedule-failed-exec::
 +--no-reschedule-failed-exec::
 +      Automatically reschedule `exec` commands that failed. This only makes
 +      sense in interactive mode (or when an `--exec` option was provided).
 +
  INCOMPATIBLE OPTIONS
  --------------------
  
@@@ -554,8 -549,6 +554,6 @@@ commit started empty (had no changes re
  start with) or ended empty (all changes were already applied
  upstream in other commits).
  
- The merge backend does the same.
- 
  The interactive backend drops commits by default that
  started empty and halts if it hits a commit that ended up empty.
  The `--keep-empty` option exists for the interactive backend to allow
@@@ -564,9 -557,8 +562,9 @@@ it to keep commits that started empty
  Directory rename detection
  ~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 -The merge and interactive backends work fine with
 -directory rename detection.  The am backend sometimes does not.
 +Directory rename heuristics are enabled in the merge and interactive
 +backends.  Due to the lack of accurate tree information, directory
 +rename detection is disabled in the am backend.
  
  include::merge-strategies.txt[]
  
@@@ -974,7 -966,7 +972,7 @@@ when the merge operation did not even s
  
  At this time, the `merge` command will *always* use the `recursive`
  merge strategy for regular merges, and `octopus` for octopus merges,
 -strategy, with no way to choose a different one. To work around
 +with no way to choose a different one. To work around
  this, an `exec` command can be used to call `git merge` explicitly,
  using the fact that the labels are worktree-local refs (the ref
  `refs/rewritten/onto` would correspond to the label `onto`, for example).