diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-31 08:18:45 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-31 12:24:07 -0700 |
| commit | f67336dabf8b77f1eee0341790c8fbbe5c6d81dd (patch) | |
| tree | d0273c98e93bf7389ee8846626d741835d780071 /mergetools/gvimdiff2 | |
| parent | t3427: fix erroneous assumption (diff) | |
| download | tgif-f67336dabf8b77f1eee0341790c8fbbe5c6d81dd.tar.xz | |
t3427: accommodate for the `rebase --merge` backend having been replaced
Since 68aa495b590 (rebase: implement --merge via the interactive
machinery, 2018-12-11), the job of the old `--merge` backend is now
performed by the `--interactive` backend, too.
One consequence is that empty commits are no longer rebased by default.
Meaning that the test case that calls `git rebase -Xsubtree` (which used
to be handled by the `--merge` backend) now needs to ask explicitly for
the empty commit to be rebased.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions