summaryrefslogtreecommitdiff
path: root/tests/test-getbundle.t
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-27 14:30:31 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-27 14:30:31 +0100
commit4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch)
tree75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-getbundle.t
parent59a96880b5d035db83067acda8345497c75d7716 (diff)
parent921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff)
downloadmercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.tar.gz
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being usable by Lorry. We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-getbundle.t')
-rw-r--r--tests/test-getbundle.t1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test-getbundle.t b/tests/test-getbundle.t
index 83feda6..049b45c 100644
--- a/tests/test-getbundle.t
+++ b/tests/test-getbundle.t
@@ -1,4 +1,3 @@
- $ "$TESTDIR/hghave" serve || exit 80
= Test the getbundle() protocol function =