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

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

add cmdutil.remoteui...
add cmdutil.remoteui remoteui sorts out the issues of getting ssh config options from the local repo into the remote one while not copying other options like hooks.
Stefano Tortarolo - - Load All Authors

File last commit:

r6906:808f03f6 default
r8188:f3abe032 default
Show More
test-rebase-abort.out
31 lines | 395 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
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