equal
deleted
inserted
replaced
423 test that we dont end up in merge conflicts |
423 test that we dont end up in merge conflicts |
424 |
424 |
425 $ echo bar > bar |
425 $ echo bar > bar |
426 $ hg prev |
426 $ hg prev |
427 abort: conflicting changes |
427 abort: conflicting changes |
428 (commit or update --clean to discard changes) |
428 (do you want --merge?) |
429 [255] |
429 [255] |
430 |
430 |
431 $ echo hi > bar |
431 $ echo hi > bar |
432 $ hg prev |
432 $ hg prev |
433 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
433 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
435 $ echo bar > bar |
435 $ echo bar > bar |
436 $ hg add bar |
436 $ hg add bar |
437 |
437 |
438 $ hg next |
438 $ hg next |
439 abort: conflicting changes |
439 abort: conflicting changes |
440 (commit or update --clean to discard changes) |
440 (do you want --merge?) |
441 [255] |
441 [255] |