equal
deleted
inserted
replaced
555 $ hg resolve -l |
555 $ hg resolve -l |
556 R emp1 |
556 R emp1 |
557 R emp2 |
557 R emp2 |
558 R emp3 |
558 R emp3 |
559 |
559 |
|
560 Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): |
|
561 =============================================================================================== |
|
562 |
|
563 $ hg resolve -u emp1 |
|
564 |
|
565 $ hg resolve -l |
|
566 U emp1 |
|
567 R emp2 |
|
568 R emp3 |
|
569 |
|
570 $ hg resolve -u << EOF |
|
571 > n |
|
572 > EOF |
|
573 mark all resolved files as unresolved (yn)? n |
|
574 abort: user quit |
|
575 [255] |
|
576 |
|
577 $ hg resolve -m << EOF |
|
578 > y |
|
579 > EOF |
|
580 mark all unresolved files as resolved (yn)? y |
|
581 (no more unresolved files) |
|
582 continue: hg rebase --continue |
|
583 |
|
584 $ hg resolve -l |
|
585 R emp1 |
|
586 R emp2 |
|
587 R emp3 |
|
588 |
560 $ hg rebase --abort |
589 $ hg rebase --abort |
561 rebase aborted |
590 rebase aborted |
562 $ cd .. |
591 $ cd .. |