Changeset View
Changeset View
Standalone View
Standalone View
tests/test-merge2.t
| Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s) | |||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ echo This is file b2 > b | $ echo This is file b2 > b | ||||
| $ hg commit -A -m "commit #2" | $ hg commit -A -m "commit #2" | ||||
| adding b | adding b | ||||
| created new head | created new head | ||||
| $ hg merge 'wdir()' | $ hg merge 'wdir()' | ||||
| abort: merging with the working copy has no effect | abort: merging with the working copy has no effect | ||||
| [255] | [10] | ||||
| $ cd .. | $ cd .. | ||||