changeset 4240 | 323b3dac5bba |
parent 4237 | 9e64a7d09895 |
child 4251 | a5ec7652c4f4 |
4239:7e274734cc2c | 4240:323b3dac5bba |
---|---|
373 |
373 |
374 $ echo babar > bar |
374 $ echo babar > bar |
375 |
375 |
376 $ hg next --evolve |
376 $ hg next --evolve |
377 abort: uncommitted changes |
377 abort: uncommitted changes |
378 (use `hg amend`, `hg revert` or `hg shelve`) |
|
378 [255] |
379 [255] |
379 |
380 |
380 $ cd .. |
381 $ cd .. |
381 |
382 |
382 Testing that `next` and `prev` respects `commands.update.check=noconflict` |
383 Testing that `next` and `prev` respects `commands.update.check=noconflict` |