summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2008-03-01 11:12:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-04 06:13:57 (GMT)
commit4947cf9cc377b15006f3e649c59edf9bc813af6f (patch)
tree0b7f36f31559f1b5c7c7722bce4eb4675e272bff /Documentation/config.txt
parent30b5940bcd3ed7392795f6a27563013f6f806de4 (diff)
downloadgit-4947cf9cc377b15006f3e649c59edf9bc813af6f.zip
git-4947cf9cc377b15006f3e649c59edf9bc813af6f.tar.gz
git-4947cf9cc377b15006f3e649c59edf9bc813af6f.tar.bz2
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 'Documentation/config.txt')
0 files changed, 0 insertions, 0 deletions