Mercurial > hg

view tests/test-merge5.out @ 11087:dc2f37864348

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: simplify record switch in kwtemplater.overwrite 1) use kwtemplater.record attribute for clarity 2) drop optional context argument; consider the speed loss by duplicating the dictionary lookup repo['.'] as negligible
author Christian Ebert <blacktrash@gmx.net>
date Sat, 01 May 2010 23:59:39 +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