summaryrefslogtreecommitdiff
path: root/tests/test-diff-change.t
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2011-10-01 20:49:36 +0000
committerLorry <lorry@roadtrain.codethink.co.uk>2012-09-27 13:27:51 +0000
commit921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch)
tree3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-diff-change.t
parent9039c805b0a7e36220101323f82735f08a104b37 (diff)
downloadmercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-diff-change.t')
-rw-r--r--tests/test-diff-change.t11
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/test-diff-change.t b/tests/test-diff-change.t
index 05d34ad..271735e 100644
--- a/tests/test-diff-change.t
+++ b/tests/test-diff-change.t
@@ -29,18 +29,12 @@ Testing diff --change
-first
+second
-Test dumb revspecs (issue3474)
-
- $ hg diff -r 2:2
- $ hg diff -r "2 and 1"
- abort: empty revision range
- [255]
Testing diff --change when merge:
$ for i in 1 2 3 4 5 6 7 8 9 10; do
- > echo $i >> file.txt
- > done
+ $ echo $i >> file.txt
+ $ done
$ hg commit -m "lots of text" # 3
$ sed -e 's,^2$,x,' file.txt > file.txt.tmp
@@ -90,4 +84,3 @@ must be similar to 'hg diff --change 5':
9
10
- $ cd ..