equal
deleted
inserted
replaced
461 patching file baz |
461 patching file baz |
462 Hunk #1 FAILED at 0 |
462 Hunk #1 FAILED at 0 |
463 1 out of 1 hunks FAILED -- saving rejects to file baz.rej |
463 1 out of 1 hunks FAILED -- saving rejects to file baz.rej |
464 patch failed to apply |
464 patch failed to apply |
465 abort: fix up the working directory and run hg transplant --continue |
465 abort: fix up the working directory and run hg transplant --continue |
|
466 [255] |
|
467 $ hg transplant 1:3 |
|
468 abort: transplant in progress |
|
469 (use 'hg transplant --continue' or 'hg update' to abort) |
466 [255] |
470 [255] |
467 $ echo fixed > baz |
471 $ echo fixed > baz |
468 $ hg transplant --continue |
472 $ hg transplant --continue |
469 9d6d6b5a8275 transplanted as d80c49962290 |
473 9d6d6b5a8275 transplanted as d80c49962290 |
470 applying 1dab759070cf |
474 applying 1dab759070cf |