equal
deleted
inserted
replaced
391 $ find .hg -name '*state' -prune | sort |
391 $ find .hg -name '*state' -prune | sort |
392 .hg/dirstate |
392 .hg/dirstate |
393 .hg/merge/state |
393 .hg/merge/state |
394 .hg/rebasestate |
394 .hg/rebasestate |
395 .hg/undo.backup.dirstate |
395 .hg/undo.backup.dirstate |
396 .hg/undo.dirstate |
|
397 .hg/updatestate |
396 .hg/updatestate |
398 |
397 |
399 $ hg rebase -s 3 -d tip |
398 $ hg rebase -s 3 -d tip |
400 abort: rebase in progress |
399 abort: rebase in progress |
401 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
400 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |