equal
deleted
inserted
replaced
1749 |
1749 |
1750 - make sure update of merge with removed largefiles fails as expected |
1750 - make sure update of merge with removed largefiles fails as expected |
1751 $ hg rm sub2/large6 |
1751 $ hg rm sub2/large6 |
1752 $ hg up -r. |
1752 $ hg up -r. |
1753 abort: outstanding uncommitted merge |
1753 abort: outstanding uncommitted merge |
1754 [255] |
1754 [20] |
1755 |
1755 |
1756 - revert should be able to revert files introduced in a pending merge |
1756 - revert should be able to revert files introduced in a pending merge |
1757 $ hg revert --all -r . |
1757 $ hg revert --all -r . |
1758 removing .hglf/large |
1758 removing .hglf/large |
1759 undeleting .hglf/sub2/large6 |
1759 undeleting .hglf/sub2/large6 |