changeset 6235 | d16798000be0 |
parent 6226 | bd61e44eb2cc |
child 6246 | 35bf9c23e17a |
6234:a47462264906 | 6235:d16798000be0 |
---|---|
59 hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f |
59 hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f |
60 |
60 |
61 rm i/g |
61 rm i/g |
62 echo % should abort, because i is modified |
62 echo % should abort, because i is modified |
63 hg --cwd i fetch ../h |
63 hg --cwd i fetch ../h |
64 |
|
65 true |