equal
deleted
inserted
replaced
1703 M large |
1703 M large |
1704 |
1704 |
1705 - make sure update of merge with removed largefiles fails as expected |
1705 - make sure update of merge with removed largefiles fails as expected |
1706 $ hg rm sub2/large6 |
1706 $ hg rm sub2/large6 |
1707 $ hg up -r. |
1707 $ hg up -r. |
1708 abort: outstanding uncommitted merges |
1708 abort: outstanding uncommitted merge |
1709 [255] |
1709 [255] |
1710 |
1710 |
1711 - revert should be able to revert files introduced in a pending merge |
1711 - revert should be able to revert files introduced in a pending merge |
1712 $ hg revert --all -r . |
1712 $ hg revert --all -r . |
1713 removing .hglf/large (glob) |
1713 removing .hglf/large (glob) |