equal
deleted
inserted
replaced
316 |
316 |
317 Implicit merge with test branch as parent: |
317 Implicit merge with test branch as parent: |
318 |
318 |
319 $ hg merge |
319 $ hg merge |
320 abort: branch 'test' has one head - please merge with an explicit rev |
320 abort: branch 'test' has one head - please merge with an explicit rev |
321 (run 'hg heads' to see all heads) |
321 (run 'hg heads' to see all heads, specify rev with -r) |
322 [255] |
322 [255] |
323 $ hg up -C default |
323 $ hg up -C default |
324 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
324 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
325 |
325 |
326 Implicit merge with default branch as parent: |
326 Implicit merge with default branch as parent: |
327 |
327 |
328 $ hg merge |
328 $ hg merge |
329 abort: branch 'default' has 3 heads - please merge with an explicit rev |
329 abort: branch 'default' has 3 heads - please merge with an explicit rev |
330 (run 'hg heads .' to see heads) |
330 (run 'hg heads .' to see heads, specify rev with -r) |
331 [255] |
331 [255] |
332 |
332 |
333 3 branch heads, explicit merge required: |
333 3 branch heads, explicit merge required: |
334 |
334 |
335 $ hg merge 2 |
335 $ hg merge 2 |