equal
deleted
inserted
replaced
716 |
716 |
717 [255] |
717 [255] |
718 |
718 |
719 Unshelve --abort fails with appropriate message if there's no unshelve in |
719 Unshelve --abort fails with appropriate message if there's no unshelve in |
720 progress |
720 progress |
|
721 |
|
722 #if abortflag |
|
723 $ hg unshelve --abort |
|
724 abort: no unshelve in progress |
|
725 [255] |
|
726 #else |
721 $ hg abort |
727 $ hg abort |
722 abort: no unshelve in progress (abortflag !) |
728 aborting the merge, updating back to 9451eaa6eee3 |
723 abort: merge in progress but does not support 'hg abort' (no-abortflag !) |
729 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
724 (use 'hg commit' or 'hg merge --abort') (no-abortflag !) |
730 #endif |
725 [255] |
|
726 $ cd .. |
731 $ cd .. |
727 |
732 |
728 Unshelve respects --keep even if user intervention is needed |
733 Unshelve respects --keep even if user intervention is needed |
729 $ hg init unshelvekeep && cd unshelvekeep |
734 $ hg init unshelvekeep && cd unshelvekeep |
730 $ echo 1 > file && hg ci -Am 1 |
735 $ echo 1 > file && hg ci -Am 1 |