diff options
| author |  Mike Hommey <mh@glandium.org> | 2008-03-01 12:12:13 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-03 22:13:57 -0800 |
| commit | 4947cf9cc377b15006f3e649c59edf9bc813af6f (patch) | |
| tree | 0b7f36f31559f1b5c7c7722bce4eb4675e272bff /t/t1200-tutorial.sh | |
| parent | git-p4: Fix import of changesets with file deletions (diff) | |
| download | tgif-4947cf9cc377b15006f3e649c59edf9bc813af6f.tar.xz | |
t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge
Removing .dotest should actually not be needed, so just test the directory
don't exist after --abort, but exists after starting the rebase.
Also, execute the same tests with rebase --merge, which uses a different code
path.
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1200-tutorial.sh')
0 files changed, 0 insertions, 0 deletions