tests/test-merge5.out
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Tue, 16 Mar 2010 19:52:56 +0100
changeset 10716 5f92bde72eef
parent 9717 68a1b9d0663e
permissions -rw-r--r--
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.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved