tests/test-merge5.out
author Steve Borho <steve@borho.org>
Fri, 22 May 2009 11:42:21 -0500
changeset 8545 3682a19bb637
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.

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')