##// END OF EJS Templates
tests: use readlink.py instead of readlink...
Augie Fackler -
r34572:75bd034a default
parent child Browse files
Show More
@@ -121,8 +121,8 b' Merge - local directory conflicts with r'
121 121 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
122 122 [1]
123 123 $ hg mv a/b~2ea68033e3be a/b.old
124 $ readlink a/b.old
125 c
124 $ readlink.py a/b.old
125 a/b.old -> c
126 126 $ hg resolve --mark a/b
127 127 (no more unresolved files)
128 128 $ hg commit -m "merge link (rename link)"
General Comments 0
You need to be logged in to leave comments. Login now