equal
deleted
inserted
replaced
623 | b |
623 | b |
624 o 0 added a |
624 o 0 added a |
625 a |
625 a |
626 |
626 |
627 $ hg rebase -r . -d 2 -t :other |
627 $ hg rebase -r . -d 2 -t :other |
628 rebasing 5:5018b1509e94 "added willconflict and d" (tip) (no-changeset !) |
628 rebasing 5:5018b1509e94 tip "added willconflict and d" (no-changeset !) |
629 rebasing 5:af8d273bf580 "added willconflict and d" (tip) (changeset !) |
629 rebasing 5:af8d273bf580 tip "added willconflict and d" (changeset !) |
630 |
630 |
631 $ hg up 3 -q |
631 $ hg up 3 -q |
632 $ hg l --hidden |
632 $ hg l --hidden |
633 o 6 added willconflict and d |
633 o 6 added willconflict and d |
634 | d willconflict |
634 | d willconflict |