Mercurial > hg

view tests/test-merge5.out @ 7226:b71a52f101dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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?
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 14 Oct 2008 21:28:49 +0200
parents 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line source

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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')