equal
deleted
inserted
replaced
1793 $ cp -R . $TESTTMP/hidden-state2 |
1793 $ cp -R . $TESTTMP/hidden-state2 |
1794 |
1794 |
1795 $ hg log -G |
1795 $ hg log -G |
1796 @ 2:b18e25de2cf5 D |
1796 @ 2:b18e25de2cf5 D |
1797 | |
1797 | |
1798 | @ 1:2ec65233581b B (pruned using prune) |
|
1799 |/ |
|
1800 o 0:426bada5c675 A |
1798 o 0:426bada5c675 A |
1801 |
1799 |
1802 $ hg summary |
1800 $ hg summary |
1803 parent: 2:b18e25de2cf5 tip |
1801 parent: 2:b18e25de2cf5 tip |
1804 D |
1802 D |
1805 parent: 1:2ec65233581b (obsolete) |
|
1806 B |
|
1807 branch: default |
1803 branch: default |
1808 commit: 2 modified, 1 unknown, 1 unresolved (merge) |
1804 commit: 1 modified, 1 added, 1 unknown, 1 unresolved |
1809 update: (current) |
1805 update: (current) |
1810 phases: 3 draft |
1806 phases: 2 draft |
1811 rebase: 0 rebased, 2 remaining (rebase --continue) |
1807 rebase: 0 rebased, 2 remaining (rebase --continue) |
1812 |
1808 |
1813 $ hg rebase --abort |
1809 $ hg rebase --abort |
1814 rebase aborted |
1810 rebase aborted |
1815 |
1811 |