Mercurial > hg-stable

view tests/test-merge5.out @ 6820:639d9cb95509

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate.walk: fold findfiles into main walk loop
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Jul 2008 13:03:10 -0500
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')