equal
deleted
inserted
replaced
285 Test --all |
285 Test --all |
286 |
286 |
287 $ hg up -C 3 --hidden |
287 $ hg up -C 3 --hidden |
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
289 working directory parent is obsolete! (5eb72dbe0cb4) |
289 working directory parent is obsolete! (5eb72dbe0cb4) |
290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue) |
290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
291 $ hg --config extensions.purge= purge |
291 $ hg --config extensions.purge= purge |
292 $ hg uncommit --all -X e |
292 $ hg uncommit --all -X e |
293 1 new divergent changesets |
293 1 new divergent changesets |
294 $ hg st --copies |
294 $ hg st --copies |
295 M b |
295 M b |