equal
deleted
inserted
replaced
477 (no more unresolved files) |
477 (no more unresolved files) |
478 continue: hg rebase --continue |
478 continue: hg rebase --continue |
479 $ hg rebase --continue |
479 $ hg rebase --continue |
480 rebasing 2:fdaca8533b86 "b" (tip) |
480 rebasing 2:fdaca8533b86 "b" (tip) |
481 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
481 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
482 BROKEN: the merge state was not cleared |
|
483 $ hg resolve --list |
482 $ hg resolve --list |
484 R a |
|
485 $ test -d .hg/merge |
483 $ test -d .hg/merge |
|
484 [1] |