diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-rebase-issue-noparam-single-rev.t | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-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-rebase-issue-noparam-single-rev.t')
| -rw-r--r-- | tests/test-rebase-issue-noparam-single-rev.t | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/test-rebase-issue-noparam-single-rev.t b/tests/test-rebase-issue-noparam-single-rev.t index 6e96ee7..38f7e79 100644 --- a/tests/test-rebase-issue-noparam-single-rev.t +++ b/tests/test-rebase-issue-noparam-single-rev.t @@ -3,9 +3,6 @@ > graphlog= > rebase= > - > [phases] - > publish=False - > > [alias] > tglog = log -G --template "{rev}: '{desc}' {branches}\n" > EOF @@ -124,5 +121,3 @@ Rebase with no arguments - single revision in target branch: | o 0: 'c1' - - $ cd .. |