Show More
@@ -351,6 +351,19 b' Check dryrun working with --collapse whe' | |||
|
351 | 351 | hit a merge conflict |
|
352 | 352 | [1] |
|
353 | 353 | |
|
354 | In-memory rebase that fails due to merge conflicts | |
|
355 | ||
|
356 | $ hg rebase -s 2 -d 7 | |
|
357 | rebasing 2:177f92b77385 "c" | |
|
358 | rebasing 3:055a42cdd887 "d" | |
|
359 | rebasing 4:e860deea161a "e" | |
|
360 | merging e | |
|
361 | transaction abort! | |
|
362 | rollback completed | |
|
363 | hit merge conflicts; re-running rebase without in-memory merge | |
|
364 | abort: abort and continue do not allow specifying revisions | |
|
365 | [255] | |
|
366 | ||
|
354 | 367 | ========================== |
|
355 | 368 | Test for --confirm option| |
|
356 | 369 | ========================== |
General Comments 0
You need to be logged in to leave comments.
Login now