Mercurial > hg

view tests/test-merge5.out @ 12080:eb7ddba6046a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
win32: add Emacs scripts to Inno Setup installer
author Pascal Quantin <pascal.quantin@gmail.com>
date Sun, 29 Aug 2010 22:57:24 +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