Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-origbackup-conflict.t
changeset 34570 dbb2027f4974
parent 34543 6fad8059a970
child 34691 857fc3313f7b 
--- a/tests/test-origbackup-conflict.t	Tue Oct 10 11:02:23 2017 -0400
+++ b/tests/test-origbackup-conflict.t	Tue Oct 10 11:02:40 2017 -0400
@@ -80,8 +80,8 @@
   b: replacing untracked file
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark b1)
-  $ readlink .hg/origbackups/b
-  ../../../sym-link-target
+  $ readlink.py .hg/origbackups/b
+  .hg/origbackups/b -> ../../../sym-link-target
 
 Perform an update that causes b/c to be backed up again - it should not go into the target dir
mercurial