tests/test-rebase-abort.out
author Mads Kiilerich <mads@kiilerich.com>
Tue, 14 Oct 2008 21:28:49 +0200
changeset 7226 b71a52f101dc
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
Make it possible to disable filtering for a pattern. Rationale: Apparently there were no way to disable for example win32text extension locally. RFC: Can it already be done another way?

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