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-merge-symlinks.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-merge-symlinks.t')
| -rw-r--r-- | tests/test-merge-symlinks.t | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t index 9d50146..2219dbc 100644 --- a/tests/test-merge-symlinks.t +++ b/tests/test-merge-symlinks.t @@ -1,3 +1,4 @@ + $ cat > echo.py <<EOF > #!/usr/bin/env python > import os, sys @@ -59,5 +60,3 @@ merge working directory HG_OTHER_ISLINK 0 HG_BASE_ISLINK 0 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - - $ cd .. |