equal
deleted
inserted
replaced
53 $ echo d > c |
53 $ echo d > c |
54 $ hg resolve --mark --all |
54 $ hg resolve --mark --all |
55 (no more unresolved files) |
55 (no more unresolved files) |
56 continue: hg rebase --continue |
56 continue: hg rebase --continue |
57 $ hg rebase --continue |
57 $ hg rebase --continue |
58 abort: you must specify a destination |
58 rebasing 3:0537f6b50def "dc" (tip) |
59 (use: hg rebase -d REV) |
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob) |
60 [255] |
|