summaryrefslogtreecommitdiff
path: root/tests/test-mv-cp-st-diff.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-mv-cp-st-diff.t')
-rw-r--r--tests/test-mv-cp-st-diff.t6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/test-mv-cp-st-diff.t b/tests/test-mv-cp-st-diff.t
index 5342fea..025e62f 100644
--- a/tests/test-mv-cp-st-diff.t
+++ b/tests/test-mv-cp-st-diff.t
@@ -560,7 +560,6 @@ $4 - test description
- parent to root: --rev . --rev 0
M a
- b
R b
diff --git a/a b/a
@@ -612,7 +611,6 @@ $4 - test description
- parent to branch: --rev . --rev 2
M a
- b
A x/y
R b
@@ -908,7 +906,6 @@ $4 - test description
- parent to root: --rev . --rev 0
M a
- b
R b
R c
@@ -978,7 +975,6 @@ $4 - test description
- parent to branch: --rev . --rev 2
M a
- b
A x/y
R b
R c
@@ -1142,7 +1138,7 @@ $4 - test description
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
- moving x/x to y/x (glob)
+ moving x/x to y/x
** directory move **
** hg mv x y / add y/x x1 / add y/x x2
- working to parent: