##// END OF EJS Templates
convert/mtn: handle new files in moved directories (issue1619)...
convert/mtn: handle new files in moved directories (issue1619) Reported and investigated by Paul Aurich <paul@darkrain42.org>

File last commit:

r6906:808f03f6 default
r8099:3cdf4872 default
Show More
test-rebase-abort.out
31 lines | 395 B | text/plain | TextLexer
/ tests / test-rebase-abort.out
Stefano Tortarolo
Add rebase extension
r6906 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
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% Abort
rebase aborted
@ 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1