equal
deleted
inserted
replaced
291 $ hg update |
291 $ hg update |
292 abort: case-folding collision between b and B |
292 abort: case-folding collision between b and B |
293 [255] |
293 [255] |
294 |
294 |
295 $ hg update --check |
295 $ hg update --check |
296 abort: uncommitted local changes |
296 abort: uncommitted changes |
297 [255] |
297 [255] |
298 |
298 |
299 $ hg update --clean |
299 $ hg update --clean |
300 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
300 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
301 $ hg parents --template '{rev}\n' |
301 $ hg parents --template '{rev}\n' |