diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-31 08:18:49 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-31 12:24:07 -0700 |
| commit | a63f990d9205d1a781aec310e44edf35e29063a2 (patch) | |
| tree | 5ed548a2d14c4eaef160b71d082e5e24df9d580d /fsmonitor.h | |
| parent | t/lib-rebase: prepare for testing `git rebase --rebase-merges` (diff) | |
| download | tgif-a63f990d9205d1a781aec310e44edf35e29063a2.tar.xz | |
t3418: test `rebase -r` with merge strategies
There is a test case in this script that verifies that `git rebase
--preserve-merges` works all right with non-default merge strategies or
non-default merge strategy options.
Now that `git rebase --rebase-merges` learned about merge strategies,
let's copy-edit this test case to verify that that works as intended,
too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fsmonitor.h')
0 files changed, 0 insertions, 0 deletions