equal
deleted
inserted
replaced
404 $ hg up -q default |
404 $ hg up -q default |
405 $ hg merge foo |
405 $ hg merge foo |
406 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
406 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
407 (branch merge, don't forget to commit) |
407 (branch merge, don't forget to commit) |
408 $ hg ci --amend |
408 $ hg ci --amend |
409 abort: cannot amend while merging |
409 abort: cannot amend changesets while merging |
410 [20] |
410 [20] |
411 $ hg ci -m 'merge' |
411 $ hg ci -m 'merge' |
412 |
412 |
413 Refuse to amend if there is a merge conflict (issue5805): |
413 Refuse to amend if there is a merge conflict (issue5805): |
414 |
414 |