summaryrefslogtreecommitdiff
path: root/tests/test-rename-after-merge.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-rename-after-merge.t
parent9039c805b0a7e36220101323f82735f08a104b37 (diff)
downloadmercurial-tarball-master.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-rename-after-merge.t')
-rw-r--r--tests/test-rename-after-merge.t1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test-rename-after-merge.t b/tests/test-rename-after-merge.t
index 8c6bd49..c6033fe 100644
--- a/tests/test-rename-after-merge.t
+++ b/tests/test-rename-after-merge.t
@@ -118,4 +118,3 @@ Commit issue 1476 with a rename on the other side:
$ hg log -r tip -C -v | grep copies
copies: b2 (b1)
- $ cd ..