Mercurial > hg

view tests/test-merge5.out @ 10838:07dbafd3a0e2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a test for the inprocess status dirstate race
author Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
date Mon, 05 Apr 2010 20:10:46 +0200
parents 68a1b9d0663e
children
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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved