tree 248b6181c98a6e280360494034fbcb15090233f5
parent 68aa495b590d417e88562ab1e5da7d84d0531f21
author Elijah Newren <newren@gmail.com> 1550175941 -0800
committer Junio C Hamano <gitster@pobox.com> 1550179438 -0800

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

Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer',
2019-02-06), --merge now uses the interactive backend (and matches its
behavior) so there is no separate merge backend anymore.  Fix an
oversight in the docs that should have been updated with the previous
change.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>