Mercurial > hg

view tests/test-merge5.out @ 6390:67784cb38d58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.el: note new Emacs VC mode support
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 27 Mar 2008 12:52:41 -0700
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')