view tests/test-rebase-abort.out @ 10716:5f92bde72eef

check-code: Only call check-code if __name__ = "__main__". This changeset moves the code that actually executes something to the "if __name__ = '__main__'" section to allow the file to be imported as a module.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 16 Mar 2010 19:52:56 +0100
parents 808f03f61ebe
children b345b1cc124f
line wrap: on
line source

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