diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-02-14 12:25:41 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-02-14 13:23:58 -0800 |
| commit | 29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec (patch) | |
| tree | 248b6181c98a6e280360494034fbcb15090233f5 /git-mergetool--lib.sh | |
| parent | rebase: implement --merge via the interactive machinery (diff) | |
| download | tgif-29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec.tar.xz | |
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>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions