Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 39135:485a3349d5ee
rebase: do not pass in user option to rollback in-memory merge conflict
Nothing passed before e9e742bd0501.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 17 Aug 2018 10:21:25 +0900 |
parents | e338a921a0cd |
children | aa022f8873ea |
comparison
equal
deleted
inserted
replaced
39134:e338a921a0cd | 39135:485a3349d5ee |
---|---|
359 rebasing 4:e860deea161a "e" | 359 rebasing 4:e860deea161a "e" |
360 merging e | 360 merging e |
361 transaction abort! | 361 transaction abort! |
362 rollback completed | 362 rollback completed |
363 hit merge conflicts; re-running rebase without in-memory merge | 363 hit merge conflicts; re-running rebase without in-memory merge |
364 abort: abort and continue do not allow specifying revisions | 364 rebase aborted |
365 [255] | 365 rebasing 2:177f92b77385 "c" |
366 rebasing 3:055a42cdd887 "d" | |
367 rebasing 4:e860deea161a "e" | |
368 merging e | |
369 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | |
370 unresolved conflicts (see hg resolve, then hg rebase --continue) | |
371 [1] | |
366 | 372 |
367 ========================== | 373 ========================== |
368 Test for --confirm option| | 374 Test for --confirm option| |
369 ========================== | 375 ========================== |
370 $ cd .. | 376 $ cd .. |