changeset 45827 | 8d72e29ad1e0 |
parent 44177 | 1850066f9e36 |
45826:21733e8c924f | 45827:8d72e29ad1e0 |
---|---|
50 adding b |
50 adding b |
51 created new head |
51 created new head |
52 |
52 |
53 $ hg merge 'wdir()' |
53 $ hg merge 'wdir()' |
54 abort: merging with the working copy has no effect |
54 abort: merging with the working copy has no effect |
55 [255] |
55 [10] |
56 |
56 |
57 $ cd .. |
57 $ cd .. |