##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Fix up rebase's handling of strip backups
Fix up rebase's handling of strip backups
Matt Mackall - - Load All Authors

File last commit:

r11201:34023f2c default
r11201:34023f2c default
Show More
test-rebase-abort.out
32 lines | 419 B | text/plain | TextLexer
/ tests / test-rebase-abort.out
History | Annotation | Raw |Copy content |Copy permalink
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@ 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1
% Conflicting rebase
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
merging common
% Abort
saved backup bundle to
rebase aborted
@ 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1