--- a/tests/test-update-renames.t Sat Jul 02 09:41:40 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-Test update logic when there are renames
-
-Update with local changes across a file rename
-
- $ hg init
-
- $ echo a > a
- $ hg add a
- $ hg ci -m a
-
- $ hg mv a b
- $ hg ci -m rename
-
- $ echo b > b
- $ hg ci -m change
-
- $ hg up -q 0
-
- $ echo c > a
-
- $ hg up
- merging a and b to b
- warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
- 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges
- [1]