| changeset 44177 | 1850066f9e36 |
| parent 16913 | f2719b387380 |
| child 45827 | 8d72e29ad1e0 |
| 44176:6744859ff3ee | 44177:1850066f9e36 |
|---|---|
48 $ echo This is file b2 > b |
48 $ echo This is file b2 > b |
49 $ hg commit -A -m "commit #2" |
49 $ hg commit -A -m "commit #2" |
50 adding b |
50 adding b |
51 created new head |
51 created new head |
52 |
52 |
53 $ hg merge 'wdir()' |
|
54 abort: merging with the working copy has no effect |
|
55 [255] |
|
56 |
|
53 $ cd .. |
57 $ cd .. |