equal
deleted
inserted
replaced
390 |
390 |
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 |
|
396 .hg/updatestate |
395 .hg/updatestate |
397 |
396 |
398 $ hg rebase -s 3 -d tip |
397 $ hg rebase -s 3 -d tip |
399 abort: rebase in progress |
398 abort: rebase in progress |
400 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
399 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |