##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Use common readlink.py instead of own implementations per test script.
Use common readlink.py instead of own implementations per test script.
Matt Mackall - - Load All Authors

File last commit:

r5610:2493a478 default
r5683:396c7010 default
Show More
test-rename-dir-merge2.out
18 lines | 462 B | text/plain | TextLexer
/ tests / test-rename-dir-merge2.out
History | Annotation | Raw |Copy content |Copy permalink
adding a/f
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
moving a/f to b/f
adding a/aa/g
pulling from ../r2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b/f
A b/aa/g
a/aa/g
R a/aa/g
R a/f